Changeset 11350

Timestamp:

Oct 24, 2010, 5:52:38 AM (12 years ago)

Author:

charles

Message:

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

Location:

trunk

Files:

• gtk/add-dialog.c (modified) (1 diff)
• libtransmission/magnet.c (modified) (1 diff)
• libtransmission/utils.c (modified) (1 diff)
• libtransmission/web.c (modified) (1 diff)
• third-party/dht/dht.c (modified) (4 diffs)

trunk/gtk/add-dialog.c

@@ -374 +374 @@
     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 */

trunk/libtransmission/magnet.c

@@ -134 +134 @@
                 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;

trunk/libtransmission/utils.c

@@ -431 +431 @@
     char *        out;
 
-    if( bufsize < len )
-    {
-        bufsize = len * 2;
+    if( !buf || ( bufsize < len ) )
+    {
+        bufsize = len * 2 + 1;
         buf = tr_renew( char, buf, bufsize );
     }

trunk/libtransmission/web.c

@@ -468 +468 @@
         len = strlen( str );
 
-    for( end=str+len; str!=end; ++str ) {
+    for( end=str+len; str && str!=end; ++str ) {
         if(    ( *str == ',' )
             || ( *str == '-' )

trunk/third-party/dht/dht.c

@@ -791 +791 @@
         if(split) {
             debugf("Splitting.\n");
-            b = split_bucket(b);
+            split_bucket(b);
             return new_node(id, sa, salen, confirm);
         }
@@ -1848 +1848 @@
         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;
@@ -1917 +1917 @@
                 goto dontread;
             }
-        }
-
-        if(want > 0) {
-            want4 = (want & WANT4);
-            want6 = (want & WANT6);
-        } else {
-            want4 = source->sa_family == AF_INET;
-            want6 = source->sa_family == AF_INET6;
         }
 
@@ -2871 +2863 @@
                 *values6_len = j6;
         } else {
-            *values_len = 0;
-            *values6_len = 0;
+            if(values_len)
+                *values_len = 0;
+            if(values6_len)
+                *values6_len = 0;
         }
     }