]> granicus.if.org Git - curl/commitdiff
curl_multi_cleanup: remove superfluous NULL assigns
authorDaniel Stenberg <daniel@haxx.se>
Tue, 2 Sep 2014 21:44:42 +0000 (23:44 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Tue, 2 Sep 2014 21:44:42 +0000 (23:44 +0200)
... as the struct is free()d in the end anyway. It was first pointed out
to me that one of the ->msglist assignments were supposed to have been
->pending but was a copy and paste mistake when I realized none of the
clearing of pointers had to be there.

lib/multi.c

index 7947436c7915744ef20bc50a968b6ae51efaa790..a680ce9165e18d24a4dc8a6d66eabcdca397a6d9 100644 (file)
@@ -1881,22 +1881,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
                            multi->closure_handle->dns.hostcache);
 
       Curl_close(multi->closure_handle);
-      multi->closure_handle = NULL;
     }
 
     Curl_hash_destroy(multi->sockhash);
-    multi->sockhash = NULL;
-
     Curl_conncache_destroy(multi->conn_cache);
-    multi->conn_cache = NULL;
-
-    /* remove the pending list of messages */
     Curl_llist_destroy(multi->msglist, NULL);
-    multi->msglist = NULL;
-
-    /* remove the pending handles queue */
     Curl_llist_destroy(multi->pending, NULL);
-    multi->msglist = NULL;
 
     /* remove all easy handles */
     data = multi->easyp;
@@ -1917,7 +1907,6 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
     }
 
     Curl_hash_destroy(multi->hostcache);
-    multi->hostcache = NULL;
 
     /* Free the blacklists by setting them to NULL */
     Curl_pipeline_set_site_blacklist(NULL, &multi->pipelining_site_bl);