1
0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00

Bug #149: Deletion of unnecessary checks before a few calls of cURL functions

The following functions return immediately if a null pointer was passed.
* Curl_cookie_cleanup
* curl_formfree

It is therefore not needed that a function caller repeats a corresponding check.

This issue was fixed by using the software Coccinelle 1.0.0-rc24.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
This commit is contained in:
Markus Elfring 2015-03-11 18:15:33 +01:00 committed by Daniel Stenberg
parent 29c655c0a6
commit 9e661601fe
3 changed files with 3 additions and 6 deletions

View File

@ -969,7 +969,6 @@ void curl_formfree(struct curl_httppost *form)
next=form->next; /* the following form line */ next=form->next; /* the following form line */
/* recurse to sub-contents */ /* recurse to sub-contents */
if(form->more)
curl_formfree(form->more); curl_formfree(form->more);
if(!(form->flags & HTTPPOST_PTRNAME)) if(!(form->flags & HTTPPOST_PTRNAME))

View File

@ -198,7 +198,6 @@ curl_share_cleanup(CURLSH *sh)
} }
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
if(share->cookies)
Curl_cookie_cleanup(share->cookies); Curl_cookie_cleanup(share->cookies);
#endif #endif

View File

@ -2150,7 +2150,6 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)
if(data->share->cookies) { if(data->share->cookies) {
/* use shared cookie list, first free own one if any */ /* use shared cookie list, first free own one if any */
if(data->cookies)
Curl_cookie_cleanup(data->cookies); Curl_cookie_cleanup(data->cookies);
/* enable cookies since we now use a share that uses cookies! */ /* enable cookies since we now use a share that uses cookies! */
data->cookies = data->share->cookies; data->cookies = data->share->cookies;