From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 12 Jun 2012 21:04:04 +0000 (+0200)
Subject: singlesocket: remove dead code
X-Git-Tag: curl-7_27_0~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c13af843727c06ffec1031129ec5c30dfcd5066e;p=thirdparty%2Fcurl.git

singlesocket: remove dead code

No need to check if 'entry' is non-NULL in a spot where it is already checked
and guaranteed to be non-NULL.

(Spotted by a Coverity scan)
---

diff --git a/lib/multi.c b/lib/multi.c
index b0104310bd..f4e15c4138 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -2018,12 +2018,13 @@ static void singlesocket(struct Curl_multi *multi,
         remove_sock_from_hash = FALSE;
 
       if(remove_sock_from_hash) {
+        /* in this case 'entry' is always non-NULL */
         if(multi->socket_cb)
           multi->socket_cb(easy->easy_handle,
                            s,
                            CURL_POLL_REMOVE,
                            multi->socket_userp,
-                           entry ? entry->socketp : NULL);
+                           entry->socketp);
         sh_delentry(multi->sockhash, s);
       }