(trunk) #3663 "clang warnings in 2.11" -- fixed.

gtk/add-dialog.c

@@ -373,10 +373,6 @@ addSingleTorrentDialog( GtkWindow * parent, TrCore * core, tr_ctor * ctor )
     gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( w ), flag );
     gtk_table_attach( GTK_TABLE( t ), w, col, col + 2, row, row + 1, GTK_FILL, 0, 0, 0 );
 
-    ++row;
-    col = 0;
-    w = data->priority_combo;
-
     /* trigger sourceChanged, either directly or indirectly,
      * so that it creates the tor/gtor objects */
     w = source_chooser;

libtransmission/magnet.c

@@ -133,7 +133,7 @@ tr_magnetParse( const char * uri )
             else
                 vallen = strlen( val );
 
-            if( ( keylen==2 ) && !memcmp( key, "xt", 2 ) && !memcmp( val, "urn:btih:", 9 ) )
+            if( ( keylen==2 ) && !memcmp( key, "xt", 2 ) && val && !memcmp( val, "urn:btih:", 9 ) )
             {
                 const char * hash = val + 9;
                 const int hashlen = vallen - 9;

libtransmission/utils.c

@@ -430,9 +430,9 @@ tr_strip_positional_args( const char* str )
     const size_t  len = strlen( str );
     char *        out;
 
-    if( bufsize < len )
+    if( !buf || ( bufsize < len ) )
     {
-        bufsize = len * 2;
+        bufsize = len * 2 + 1;
         buf = tr_renew( char, buf, bufsize );
     }
 

libtransmission/web.c

@@ -467,7 +467,7 @@ tr_http_escape( struct evbuffer  * out,
     if( ( len < 0 ) && ( str != NULL ) )
         len = strlen( str );
 
-    for( end=str+len; str!=end; ++str ) {
+    for( end=str+len; str && str!=end; ++str ) {
         if(    ( *str == ',' )
             || ( *str == '-' )
             || ( *str == '.' )

third-party/dht/dht.c

@@ -790,7 +790,7 @@ new_node(const unsigned char *id, struct sockaddr *sa, int salen, int confirm)
 
         if(split) {
             debugf("Splitting.\n");
-            b = split_bucket(b);
+            split_bucket(b);
             return new_node(id, sa, salen, confirm);
         }
 
@@ -1847,7 +1847,7 @@ dht_periodic(int available, time_t *tosleep,
         unsigned short port;
         unsigned char values[2048], values6[2048];
         int values_len = 2048, values6_len = 2048;
-        int want, want4, want6;
+        int want;
         struct sockaddr_storage source_storage;
         struct sockaddr *source = (struct sockaddr*)&source_storage;
         socklen_t sourcelen = sizeof(source_storage);
@@ -1918,14 +1918,6 @@ dht_periodic(int available, time_t *tosleep,
             }
         }
 
-        if(want > 0) {
-            want4 = (want & WANT4);
-            want6 = (want & WANT6);
-        } else {
-            want4 = source->sa_family == AF_INET;
-            want6 = source->sa_family == AF_INET6;
-        }
-
         switch(message) {
         case REPLY:
             if(tid_len != 4) {
@@ -2870,8 +2862,10 @@ parse_message(const unsigned char *buf, int buflen,
             if(values6_len)
                 *values6_len = j6;
         } else {
-            *values_len = 0;
-            *values6_len = 0;
+            if(values_len)
+                *values_len = 0;
+            if(values6_len)
+                *values6_len = 0;
         }
     }