diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2015-03-11 18:15:33 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2015-03-16 12:13:56 +0100 |
commit | 9e661601feba03d1158ac466a457d5a6ce7f3f11 (patch) | |
tree | f2c50d2dc10e01524a10a7113da2d566eb95fea4 | |
parent | 29c655c0a6affc0359e499162e8308663eb4d04f (diff) |
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>
-rw-r--r-- | lib/formdata.c | 3 | ||||
-rw-r--r-- | lib/share.c | 3 | ||||
-rw-r--r-- | lib/url.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/lib/formdata.c b/lib/formdata.c index 3f41a4275..3076a1437 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -969,8 +969,7 @@ void curl_formfree(struct curl_httppost *form) next=form->next; /* the following form line */ /* recurse to sub-contents */ - if(form->more) - curl_formfree(form->more); + curl_formfree(form->more); if(!(form->flags & HTTPPOST_PTRNAME)) free(form->name); /* free the name */ diff --git a/lib/share.c b/lib/share.c index b8b6bee80..3fc53119e 100644 --- a/lib/share.c +++ b/lib/share.c @@ -198,8 +198,7 @@ curl_share_cleanup(CURLSH *sh) } #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) - if(share->cookies) - Curl_cookie_cleanup(share->cookies); + Curl_cookie_cleanup(share->cookies); #endif #ifdef USE_SSL @@ -2150,8 +2150,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, #if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) if(data->share->cookies) { /* 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! */ data->cookies = data->share->cookies; } |