]> granicus.if.org Git - curl/commitdiff
multi.c: Fixed compilation warnings when no verbose string support
authorSteve Holme <steve_holme@hotmail.com>
Sun, 23 Nov 2014 19:51:01 +0000 (19:51 +0000)
committerSteve Holme <steve_holme@hotmail.com>
Sun, 23 Nov 2014 19:51:24 +0000 (19:51 +0000)
warning: variable 'connection_id' set but not used
warning: unused parameter 'lineno'

lib/multi.c

index 7ea366ca2ebb34159664240487bb50e8ca91e992..df413ace4b36ce5867be2a1e79cd2c3d2ad5321b 100644 (file)
@@ -113,20 +113,23 @@ static void mstate(struct SessionHandle *data, CURLMstate state
 #endif
 )
 {
-#ifdef DEBUGBUILD
-  long connection_id = -5000;
-#endif
   CURLMstate oldstate = data->mstate;
 
+#if defined(DEBUGBUILD) && defined(CURL_DISABLE_VERBOSE_STRINGS)
+  (void) lineno;
+#endif
+
   if(oldstate == state)
     /* don't bother when the new state is the same as the old state */
     return;
 
   data->mstate = state;
 
-#ifdef DEBUGBUILD
+#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
   if(data->mstate >= CURLM_STATE_CONNECT_PEND &&
      data->mstate < CURLM_STATE_COMPLETED) {
+    long connection_id = -5000;
+
     if(data->easy_conn)
       connection_id = data->easy_conn->connection_id;
 
@@ -136,6 +139,7 @@ static void mstate(struct SessionHandle *data, CURLMstate state
           (void *)data, lineno, connection_id);
   }
 #endif
+
   if(state == CURLM_STATE_COMPLETED)
     /* changing to COMPLETED means there's one less easy handle 'alive' */
     data->multi->num_alive--;