Changeset 9682

Timestamp:

Dec 7, 2009, 4:06:14 AM (12 years ago)

Author:

charles

Message:

(trunk) fix warnings found by the clang static analyzer, reported & patched by wereHamster

Location:

trunk

Files:

• daemon/remote.c (modified) (2 diffs)
• gtk/details.c (modified) (1 diff)
• gtk/main.c (modified) (1 diff)
• gtk/makemeta-ui.c (modified) (2 diffs)
• gtk/tr-core.c (modified) (3 diffs)
• gtk/tr-window.c (modified) (2 diffs)
• gtk/util.c (modified) (3 diffs)

trunk/daemon/remote.c

@@ -1175 +1175 @@
             char         buf2[512];
             int64_t      i, j, k;
-            tr_bool      isStopped;
             tr_bool      boolVal;
-
-            isStopped = tr_bencDictFindInt( t, "status", &i ) && (i==TR_STATUS_STOPPED);
 
             printf( "NAME\n" );
@@ -1877 +1874 @@
         host = tr_strdup( DEFAULT_HOST );
 
-    exit_status |= readargs( argc, (const char**)argv );
-    if( reqCount )
-        exit_status = processRequests( host, port, (const char**)reqs, reqCount );
-    else {
+    readargs( argc, (const char**)argv );
+    if( reqCount == 0 ) {
         showUsage( );
         return EXIT_FAILURE;
     }
 
+    exit_status = processRequests( host, port, (const char**)reqs, reqCount );
 
     for( i=0; i<reqCount; ++i )

trunk/gtk/details.c

@@ -1193 +1193 @@
     int * peerCount;
     GtkTreeIter iter;
+    GtkTreeModel * model;
     GHashTable * hash = di->peer_hash;
     GtkListStore * store = di->peer_store;
-    GtkTreeModel * model = GTK_TREE_MODEL( store );
     struct tr_peer_stat ** peers;
 

trunk/gtk/main.c

@@ -251 +251 @@
 refreshDetailsDialog( struct cbdata * data, GtkWidget * details )
 {
-    GtkTreeSelection * s = tr_window_get_selection( data->wind );
+    GtkTreeSelection * s;
     GtkTreeModel * model;
     GSList * ids = NULL;

trunk/gtk/makemeta-ui.c

@@ -60 +60 @@
 onProgressDialogRefresh( gpointer data )
 {
-    char * str;
+    char * str = NULL;
     MakeMetaUI * ui = data;
     const tr_metainfo_builder * b = ui->builder;
@@ -81 +81 @@
     else if( b->result == TR_MAKEMETA_IO_WRITE )
         str = g_strdup_printf( _( "Error writing \"%s\": %s" ), b->errfile, g_strerror( b->my_errno ) );
-    gtk_label_set_text( GTK_LABEL( ui->progress_label ), str );
-    g_free( str );
+    else
+        g_assert_not_reached( );
+
+    if( str != NULL ) {
+        gtk_label_set_text( GTK_LABEL( ui->progress_label ), str );
+        g_free( str );
+    }
 
     /* progress bar */

trunk/gtk/tr-core.c

@@ -956 +956 @@
 tr_core_add_metainfo( TrCore      * core,
                       const char  * payload,
-                      gboolean    * setme_success,
+                      gboolean    * setme_handled,
                       GError     ** gerr UNUSED )
 {
@@ -963 +963 @@
     if( !session )
     {
-        *setme_success = FALSE;
+        *setme_handled = FALSE;
     }
     else if( gtr_is_supported_url( payload ) || gtr_is_magnet_link( payload ) )
     {
         tr_core_add_from_url( core, payload );
-        *setme_success = TRUE;
+        *setme_handled = TRUE;
     }
     else /* base64-encoded metainfo */
     {
-        int err;
         int file_length;
         tr_ctor * ctor;
@@ -982 +981 @@
 
         file_contents = tr_base64_decode( payload, -1, &file_length );
-        err = tr_ctorSetMetainfo( ctor, (const uint8_t*)file_contents, file_length );
-
-        if( !err )
-            err = add_ctor( core, ctor, do_prompt, TRUE );
+        tr_ctorSetMetainfo( ctor, (const uint8_t*)file_contents, file_length );
+        add_ctor( core, ctor, do_prompt, TRUE );
 
         tr_free( file_contents );
         tr_core_torrents_added( core );
-        *setme_success = TRUE;
+        *setme_handled = TRUE;
     }
 

trunk/gtk/tr-window.c

@@ -881 +881 @@
 
     /* main menu */
-    w = mainmenu = action_get_widget( "/main-window-menu" );
+    mainmenu = action_get_widget( "/main-window-menu" );
     w = action_get_widget( "/main-window-menu/torrent-menu/update-tracker" );
 #if GTK_CHECK_VERSION( 2, 12, 0 )
@@ -889 +889 @@
 
     /* toolbar */
-    w = toolbar = p->toolbar = action_get_widget( "/main-window-toolbar" );
+    toolbar = p->toolbar = action_get_widget( "/main-window-toolbar" );
     action_set_important( "add-torrent-toolbar", TRUE );
     action_set_important( "show-torrent-properties", TRUE );

trunk/gtk/util.c

@@ -564 +564 @@
 {
     /* FIXME: why is this static? */
-    static gboolean success = FALSE;
+    static gboolean handled = FALSE;
 
 #ifdef HAVE_DBUS_GLIB
@@ -597 +597 @@
                                G_TYPE_STRING, payload,
                                G_TYPE_INVALID,
-                               G_TYPE_BOOLEAN, &success,
+                               G_TYPE_BOOLEAN, &handled,
                                G_TYPE_INVALID );
         if( err )
@@ -613 +613 @@
 
 #endif
-    return success;
+    return handled;
 }