From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 3 Mar 2016 20:14:36 +0000 (+0100)
Subject: cookie: remove redundant check
X-Git-Tag: curl-7_48_0~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33a0a926c59cd848f20764ecf0144f69df576c68;p=thirdparty%2Fcurl.git

cookie: remove redundant check

... as it was already checked previously within the function.

Reported-by: Dmitry-Me
Closes #695
---

diff --git a/lib/cookie.c b/lib/cookie.c
index c542476a90..1fd97c013d 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -1277,6 +1277,7 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere)
   struct Cookie *co;
   FILE *out;
   bool use_stdout=FALSE;
+  char *format_ptr;
 
   if((NULL == c) || (0 == c->numcookies))
     /* If there are no known cookies, we don't write or even create any
@@ -1297,27 +1298,23 @@ static int cookie_output(struct CookieInfo *c, const char *dumphere)
       return 1; /* failure */
   }
 
-  if(c) {
-    char *format_ptr;
-
-    fputs("# Netscape HTTP Cookie File\n"
-          "# https://curl.haxx.se/docs/http-cookies.html\n"
-          "# This file was generated by libcurl! Edit at your own risk.\n\n",
-          out);
+  fputs("# Netscape HTTP Cookie File\n"
+        "# https://curl.haxx.se/docs/http-cookies.html\n"
+        "# This file was generated by libcurl! Edit at your own risk.\n\n",
+        out);
 
-    for(co = c->cookies; co; co = co->next) {
-      if(!co->domain)
-        continue;
-      format_ptr = get_netscape_format(co);
-      if(format_ptr == NULL) {
-        fprintf(out, "#\n# Fatal libcurl error\n");
-        if(!use_stdout)
-          fclose(out);
+  for(co = c->cookies; co; co = co->next) {
+    if(!co->domain)
+      continue;
+    format_ptr = get_netscape_format(co);
+    if(format_ptr == NULL) {
+      fprintf(out, "#\n# Fatal libcurl error\n");
+      if(!use_stdout)
+        fclose(out);
         return 1;
-      }
-      fprintf(out, "%s\n", format_ptr);
-      free(format_ptr);
     }
+    fprintf(out, "%s\n", format_ptr);
+    free(format_ptr);
   }
 
   if(!use_stdout)