lots of C correctness tweaks suggested by sparse/cgcc

diff --git a/cli/cli.c b/cli/cli.c
index d35e95180939fe0a7b53a8ef6f814a00278e7b0f..0e5ac1a308955dc0fa6c7b99231bb904d6bf9411 100644 (file)
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -65,7 +65,7 @@ static const char   * comment      = NULL;
 static int  parseCommandLine ( int argc, const char ** argv );
 static void sigHandler       ( int signal );
 
-char*
+static char*
 tr_strlratio( char * buf, double ratio, size_t buflen )
 {
     if( (int)ratio == TR_RATIO_NA )
@@ -437,7 +437,7 @@ getUsage( void )
            "Usage: "MY_NAME" [options] <torrent-filename>";
 }
 
-const struct tr_option options[] = {
+static const struct tr_option options[] = {
     { 'a', "announce", "Set the new torrent's announce URL", "a", 1, "<url>" },
     { 'b', "blocklist", "Enable peer blocklists", "b", 0, NULL },
     { 'B', "no-blocklist", "Disable peer blocklists", "B", 0, NULL },

diff --git a/daemon/daemon.c b/daemon/daemon.c
index 296a1c29bcf7705885a27853775394d5fe09d7b3..81cb9ee3f8d5ee0ef2cd466862caf4a103edf6c8 100644 (file)
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -231,7 +231,7 @@ getUsage( void )
            "Usage: "MY_NAME" [options]";
 }
 
-const struct tr_option options[] = {
+static const struct tr_option options[] = {
     { 'a', "acl",       "Access Control List.  (Default: "TR_DEFAULT_RPC_ACL")", "a", 1, "<list>" },
     { 'b', "blocklist", "Enable peer blocklists",             "b", 0, NULL },
     { 'B', "no-blocklist", "Disable peer blocklists",         "B", 0, NULL },

diff --git a/daemon/remote.c b/daemon/remote.c
index f9ccf4028dd26f57204c612c4651cc0319bc74db..1022ace97a809d22749edc8e5f8543159e8cee1f 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -682,8 +682,8 @@ printFileList( tr_benc * top )
                     {
                         char sizestr[64];
                         double percent = (double)have / length;
-                        strlsize( sizestr, length, sizeof( sizestr ) );
                         const char * pristr;
+                        strlsize( sizestr, length, sizeof( sizestr ) );
                         switch( priority ) {
                             case TR_PRI_LOW:    pristr = "Low"; break;
                             case TR_PRI_HIGH:   pristr = "High"; break;

diff --git a/gtk/actions.c b/gtk/actions.c
index ec55802e71f11b7706880cf2c3644989ba785e94..bf793fc2be16c45995a9800b5391a813df09c046 100644 (file)
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -14,6 +14,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libtransmission/transmission.h>
+#include "actions.h"
 #include "conf.h"
 #include "tr-core.h"
 #include "tr-prefs.h"
@@ -22,11 +23,9 @@
 
 #define UNUSED G_GNUC_UNUSED
 
-extern void doAction (const char * action_name, gpointer user_data );
+static TrCore * myCore = NULL;
 
-static TrCore * myCore = 0;
-
-static GtkActionGroup * myGroup = 0;
+static GtkActionGroup * myGroup = NULL;
 
 static void
 action_cb ( GtkAction * a, gpointer user_data )
@@ -140,7 +139,7 @@ typedef struct
 }
 BuiltinIconInfo;
 
-const BuiltinIconInfo my_fallback_icons [] =
+static const BuiltinIconInfo my_fallback_icons [] =
 {
     { tr_icon_logo, "transmission" },
     { tr_icon_lock, "transmission-lock" }
@@ -165,7 +164,7 @@ register_my_icons ( void )
             GdkPixbuf * p;
             GtkIconSet * icon_set;
 
-            p = gdk_pixbuf_new_from_inline( -1, my_fallback_icons[i].raw, FALSE, 0 );
+            p = gdk_pixbuf_new_from_inline( -1, my_fallback_icons[i].raw, FALSE, NULL );
             width = gdk_pixbuf_get_width( p );
             icon_set = gtk_icon_set_new_from_pixbuf( p );
             gtk_icon_theme_add_builtin_icon( name, width, p );

diff --git a/gtk/actions.h b/gtk/actions.h
index f590636fe387d20fc12a44bc3a253942002e9f7d..75ffddd5bdf58b972e379378090b872a9dd9112e 100644 (file)
--- a/gtk/actions.h
+++ b/gtk/actions.h
@@ -28,4 +28,6 @@ void action_toggle ( const char * name, gboolean b );
 
 GtkWidget* action_get_widget ( const char * path );
 
+void doAction( const char * action_name, gpointer user_data );
+
 #endif

diff --git a/gtk/details.c b/gtk/details.c
index 0f2be5c0fb3e0fb9b86c99161aa28e22c854f5a0..bba621b1175dc5362eef88079705b9ebfd35f296 100644 (file)
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -1165,7 +1165,7 @@ struct tracker_page
     GtkWidget * manual_announce_countdown_lb;
 };
 
-GtkWidget*
+static GtkWidget*
 tracker_page_new( TrTorrent * gtor )
 {
     GtkWidget * t;

diff --git a/gtk/main.c b/gtk/main.c
index 8498aa695c06d28346de3114704ad92b677821b8..5dec78b9f3252ba48e2f446c523162a19ebfd0fe 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -410,6 +410,8 @@ main( int argc, char ** argv )
 
     if( didlock && ( didinit || cf_init( configDir, &err ) ) )
     {
+        GtkWindow * win;
+
         tr_handle * h = tr_sessionInitFull(
                             configDir,
                             "gtk",
@@ -444,7 +446,7 @@ main( int argc, char ** argv )
         cbdata->core = tr_core_new( h );
 
         /* create main window now to be a parent to any error dialogs */
-        GtkWindow * win = GTK_WINDOW( tr_window_new( myUIManager, cbdata->core ) );
+        win = GTK_WINDOW( tr_window_new( myUIManager, cbdata->core ) );
         g_signal_connect( win, "window-state-event", G_CALLBACK(windowStateChanged), cbdata );
         g_signal_connect( win, "size-allocate", G_CALLBACK(onMainWindowSizeAllocated), cbdata );
 
@@ -1047,7 +1049,7 @@ g_message( "setting encryption to %d", encryption );
     }
 }
 
-gboolean
+static gboolean
 updatemodel( gpointer gdata )
 {
     struct cbdata *data = gdata;

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index aebacee07afa15e46eb32194b48b093d371bb8d6..58a9b3123b12efc12ff41ab1aba18a484736f0d7 100644 (file)
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -1039,10 +1039,10 @@ maybeInhibitHibernation( TrCore * core )
 {
     gboolean allowHibernation;
     tr_handle * session = tr_core_handle( core );
+    tr_torrent * tor = NULL;
 
     /* allow hibernation unless we have active torrents */
     allowHibernation = TRUE;
-    tr_torrent * tor = NULL;
     while(( tor = tr_torrentNext( session, tor ))) {
         if( tr_torrentGetStatus( tor ) != TR_STATUS_STOPPED ) {
             allowHibernation = FALSE;

diff --git a/gtk/tr-prefs.c b/gtk/tr-prefs.c
index 9e4ac31d90260bb4ec614293972c0101a879c339..8105b7a14cd6cde3eb56d2bce5357cc1127d645b 100644 (file)
--- a/gtk/tr-prefs.c
+++ b/gtk/tr-prefs.c
@@ -270,9 +270,12 @@ testing_port_begin( gpointer gdata )
 static void
 testing_port_cb( GtkWidget * unused UNUSED, gpointer l )
 {
+    struct test_port_data * data;
+
     gtk_label_set_markup( GTK_LABEL( l ), _( "<i>Testing port...</i>" ) );
+
     /* wait three seconds to give the port forwarding time to kick in */
-    struct test_port_data * data = g_new0( struct test_port_data, 1 );
+    data = g_new0( struct test_port_data, 1 );
     data->label = l;
     data->alive = g_object_get_data( G_OBJECT( l ), "alive" );
     g_timeout_add( 3000, testing_port_begin, data );
@@ -418,11 +421,12 @@ got_blocklist( tr_handle   * handle         UNUSED,
     }
     if( ok && !data->abortFlag )
     {
+        char * cmd;
         filename2 = g_strdup_printf( "%s.txt", filename );
         g_snprintf( data->secondary, sizeof( data->secondary ),
                     _( "Uncompressing blocklist..." ) );
         g_idle_add( blocklistDialogSetSecondary, data );
-        char * cmd = g_strdup_printf( "zcat %s > %s ", filename, filename2 );
+        cmd = g_strdup_printf( "zcat %s > %s ", filename, filename2 );
         tr_dbg( "%s", cmd );
         system( cmd );
         g_free( cmd );

diff --git a/gtk/tr-torrent.c b/gtk/tr-torrent.c
index 4b3cb9787936c22092100e16b0ab87ad9f8ec7f6..97baf790788575653a88a1766dc28af40a78f499 100644 (file)
--- a/gtk/tr-torrent.c
+++ b/gtk/tr-torrent.c
@@ -227,7 +227,7 @@ tr_torrent_new_ctor( tr_handle  * handle,
 char *
 tr_torrent_status_str ( TrTorrent * gtor )
 {
-    char * top = 0;
+    char * top = NULL;
 
     const tr_stat * st = tr_torrent_stat( gtor );
 

diff --git a/gtk/tr-window.c b/gtk/tr-window.c
index 412909ae7328c55786efc026293b04233aa5d1fb..230b1e56c0a922261871cf3683641470dc786c4c 100644 (file)
--- a/gtk/tr-window.c
+++ b/gtk/tr-window.c
@@ -101,7 +101,7 @@ PrivateData;
 #define FILTER_TEXT_MODE_KEY "tr-filter-text-mode"
 #define FILTER_TOGGLES_KEY "tr-filter-toggles"
 
-PrivateData*
+static PrivateData*
 get_private_data( TrWindow * w )
 {
     return g_object_get_data (G_OBJECT(w), PRIVATE_DATA_KEY);
@@ -224,7 +224,7 @@ static void
 onYinYangReleased( GtkWidget * w UNUSED, GdkEventButton * button UNUSED, gpointer vprivate )
 {
     PrivateData * p = vprivate;
-    gtk_menu_popup( GTK_MENU( p->status_menu ), 0, 0, 0, 0, 0, gtk_get_current_event_time( ) );
+    gtk_menu_popup( GTK_MENU( p->status_menu ), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time( ) );
 }
 
 #define STATS_MODE "stats-mode"
@@ -401,7 +401,7 @@ entry_icon_released( SexyIconEntry         * entry UNUSED,
                      gpointer                menu )
 {
     if ( icon_pos == SEXY_ICON_ENTRY_PRIMARY )
-        gtk_menu_popup ( GTK_MENU( menu ), 0, 0, 0, 0, 0, gtk_get_current_event_time( ) );
+        gtk_menu_popup ( GTK_MENU( menu ), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time( ) );
 }
 
 /***

diff --git a/gtk/ui.h b/gtk/ui.h
index 179492872eddff5e7c290bee2572076792bd6553..52120a8302e15f3d957c38bd50f1315134653c68 100644 (file)
--- a/gtk/ui.h
+++ b/gtk/ui.h
@@ -1,4 +1,4 @@
-const char * fallback_ui_file =
+static const char * fallback_ui_file =
 "<ui>\n"
 "  <menubar name='main-window-menu'>\n"
 "    <menu action='torrent-menu'>\n"

diff --git a/libtransmission/bencode-test.c b/libtransmission/bencode-test.c
index 24cf975a7aac5b463494d738bffacd5e747ef4e1..3839de6691709685bf88fab13e9962cfd08332f9 100644 (file)
--- a/libtransmission/bencode-test.c
+++ b/libtransmission/bencode-test.c
@@ -7,7 +7,7 @@
 
 #define VERBOSE 0
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \
     ++test; \

diff --git a/libtransmission/bencode.c b/libtransmission/bencode.c
index d0b5a0407a881a161e7ac1dbb03e06e0f0d766d1..ca71d1005f60867edb5256c172e976009a0ecddc 100644 (file)
--- a/libtransmission/bencode.c
+++ b/libtransmission/bencode.c
@@ -317,11 +317,14 @@ tr_bencParse( const void     * buf,
               tr_benc        * top,
               const uint8_t ** setme_end )
 {
+    int err;
     tr_ptrArray * parentStack = tr_ptrArrayNew( );
+
     top->type = 0; /* not initialized yet */
-    const int err = tr_bencParseImpl( buf, end, top, parentStack, setme_end );
+    err = tr_bencParseImpl( buf, end, top, parentStack, setme_end );
     if( err )
         tr_bencFree( top ); 
+
     tr_ptrArrayFree( parentStack, NULL );
     return err;
 }

diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index daf4b10a32bae3f6c59f303aa81e912a5111b881..7897a5b1310e45b365732be3588608ceab89b392 100644 (file)
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -80,7 +80,7 @@ blocklistLoad( tr_blocklist * b )
         return;
     }
 
-    b->rules = mmap( 0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 );
+    b->rules = mmap( NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0 );
     if( !b->rules ) {
         tr_err( err_fmt, b->filename, tr_strerror(errno) );
         close( fd );

diff --git a/libtransmission/clients.c b/libtransmission/clients.c
index 65f78a16471763c8feecbb0628d0c9714e2501ea..cd280242b80251df33af51be5bd5b16c97837cfa 100644 (file)
--- a/libtransmission/clients.c
+++ b/libtransmission/clients.c
@@ -20,6 +20,7 @@
 #include <libevent/event.h> /* evbuffer */
 
 #include "transmission.h"
+#include "clients.h"
 #include "utils.h"
 
 static int

diff --git a/libtransmission/fdlimit.c b/libtransmission/fdlimit.c
index 2da77d3f3690b007864112dc556f268055f2f750..315b24547690f35897502ebbf9d7c531c1208be3 100644 (file)
--- a/libtransmission/fdlimit.c
+++ b/libtransmission/fdlimit.c
@@ -47,6 +47,7 @@
 #include <evutil.h>
 
 #include "transmission.h"
+#include "fdlimit.h"
 #include "list.h"
 #include "net.h"
 #include "platform.h" /* tr_lock */

diff --git a/libtransmission/handshake.c b/libtransmission/handshake.c
index 96af0ea33a9089cf13ec2a91769192ef25b3dfc4..ad79436ff893d8e7b438f17213b7d6e4fb5261e8 100644 (file)
--- a/libtransmission/handshake.c
+++ b/libtransmission/handshake.c
@@ -969,7 +969,7 @@ fireDoneFunc( tr_handshake * handshake, int isConnected )
                           handshake->doneUserData );
 }
 
-void
+static void
 tr_handshakeDone( tr_handshake * handshake, int isOK )
 {
     dbgmsg( handshake, "handshakeDone: %s", isOK ? "connected" : "aborting" );

diff --git a/libtransmission/json-test.c b/libtransmission/json-test.c
index d82f623a90e60581998651feb0c09f876f3402d9..3cabd76f27c4419d2d179b7febd14db9ed1c030e 100644 (file)
--- a/libtransmission/json-test.c
+++ b/libtransmission/json-test.c
@@ -6,7 +6,7 @@
 
 #define VERBOSE 0
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \
     ++test; \

diff --git a/libtransmission/json.c b/libtransmission/json.c
index 5076baeb30cf6f2a41255ad2f9950fdedf3818f1..af40327aac3da32e666451c25bfdaf10ec02c7e7 100644 (file)
--- a/libtransmission/json.c
+++ b/libtransmission/json.c
@@ -21,6 +21,7 @@
 
 #include "transmission.h"
 #include "bencode.h"
+#include "json.h"
 #include "ptrarray.h"
 #include "utils.h"
 

diff --git a/libtransmission/makemeta.c b/libtransmission/makemeta.c
index 222abbbe96db9a2a7d2e50c606f682a05d535cb4..fa59742c4861eea844706bcd9b9b60451b2ee562 100644 (file)
--- a/libtransmission/makemeta.c
+++ b/libtransmission/makemeta.c
@@ -382,7 +382,7 @@ tr_realMakeMetaInfo ( tr_metainfo_builder * builder )
         if( builder->comment && *builder->comment )
             tr_bencDictAddStr( &top, "comment", builder->comment );
         tr_bencDictAddStr( &top, "created by", TR_NAME "/" LONG_VERSION_STRING );
-        tr_bencDictAddInt( &top, "creation date", time(0) );
+        tr_bencDictAddInt( &top, "creation date", time(NULL) );
         tr_bencDictAddStr( &top, "encoding", "UTF-8" );
         makeInfoDict( tr_bencDictAddDict( &top, "info", 666 ), builder );
     }

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 601c77389c1041066cefb01d8aabfd51d354f330..0113839b42240066d0eec4c2f9ad8125c691e7ba 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -1974,14 +1974,6 @@ tr_peerMsgsFree( tr_peermsgs* msgs )
     }
 }
 
-tr_publisher_tag
-tr_peerMsgsSubscribe( tr_peermsgs       * peer,
-                      tr_delivery_func    func,
-                      void              * userData )
-{
-    return tr_publisherSubscribe( peer->publisher, func, userData );
-}
-
 void
 tr_peerMsgsUnsubscribe( tr_peermsgs       * peer,
                         tr_publisher_tag    tag )

diff --git a/libtransmission/ptrarray.c b/libtransmission/ptrarray.c
index 4c3e2602fd53ca69a1e9bb06160f05b813b033c6..085ed0f6de44643a69248864ff6fedf5224f11f0 100644 (file)
--- a/libtransmission/ptrarray.c
+++ b/libtransmission/ptrarray.c
@@ -182,7 +182,7 @@ tr_ptrArrayErase( tr_ptrArray * t, int begin, int end )
 ***
 **/
 
-int
+static int
 tr_ptrArrayLowerBound( const tr_ptrArray * t,
                        const void        * ptr,
                        int                 compare( const void *,const void * ),

diff --git a/libtransmission/rpc-test.c b/libtransmission/rpc-test.c
index 0ef8afdcf7ad9cd587f273732d14708490d78e50..00f3b8d4c6763d4c2d3c7710d3678dcde8827e04 100644 (file)
--- a/libtransmission/rpc-test.c
+++ b/libtransmission/rpc-test.c
@@ -7,7 +7,7 @@
 
 #define VERBOSE 0
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \
     ++test; \

diff --git a/libtransmission/rpc.c b/libtransmission/rpc.c
index 191bf0520c1bed90555fa5d8bec008c6aa46be10..ca36d776f1205ebaf36103d95383ab8a78a56b57 100644 (file)
--- a/libtransmission/rpc.c
+++ b/libtransmission/rpc.c
@@ -642,7 +642,7 @@ sessionGet( tr_handle * h, tr_benc * args_in UNUSED, tr_benc * args_out )
 
 typedef const char* (handler)( tr_handle*, tr_benc*, tr_benc* );
 
-struct method {
+static struct method {
     const char * name;
     handler * func;
 } methods[] = { 

diff --git a/libtransmission/stats.c b/libtransmission/stats.c
index 1e77c2b1d894d947d3e690d889bcd091bed0cdb7..6c5fbe901371faf44119161a122c8333d023089c 100644 (file)
--- a/libtransmission/stats.c
+++ b/libtransmission/stats.c
@@ -15,6 +15,7 @@
 #include "transmission.h"
 #include "bencode.h"
 #include "platform.h" /* tr_sessionGetConfigDir() */
+#include "stats.h"
 #include "utils.h" /* tr_buildPath */
 
 /***
@@ -169,8 +170,8 @@ tr_sessionGetCumulativeStats( const tr_handle   * handle,
                               tr_session_stats  * setme )
 {
     const struct tr_stats_handle * stats = getStats( handle );
-    assert( stats );
     tr_session_stats current;
+    assert( stats );
     tr_sessionGetStats( handle, &current );
     addStats( setme, &stats->old, &current );
 }

diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c
index d724857924c1c4a6a7cab8690eede32080064b50..759252bbf0686c9803293b06dec665c47cfb693e 100644 (file)
--- a/libtransmission/tracker.c
+++ b/libtransmission/tracker.c
@@ -154,7 +154,7 @@ trackerSupportsScrape( tr_tracker * t, const tr_torrent * tor )
 ****
 ***/
 
-tr_tracker *
+static tr_tracker *
 findTracker( tr_session * session, const uint8_t * hash )
 {
     tr_torrent * torrent = tr_torrentFindFromHash( session, hash );
@@ -322,7 +322,8 @@ onTrackerResponse( tr_session    * session,
     if( responseCode == HTTP_OK )
     {
         tr_benc benc;
-        const int bencLoaded = !tr_bencLoad( response, responseLen, &benc, 0 );
+        const int bencLoaded = !tr_bencLoad( response, responseLen,
+                                             &benc, NULL );
         publishErrorClear( t );
         if( bencLoaded && tr_bencIsDict( &benc ) )
         {
@@ -466,7 +467,8 @@ onScrapeResponse( tr_session   * session,
     if( responseCode == HTTP_OK )
     {
         tr_benc benc, *files;
-        const int bencLoaded = !tr_bencLoad( response, responseLen, &benc, 0 );
+        const int bencLoaded = !tr_bencLoad( response, responseLen,
+                                             &benc, NULL );
         if( bencLoaded && tr_bencDictFindDict( &benc, "files", &files ) )
         {
             int i;

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index b4c3fa81fc1ae3e6c2017c402675641c18eac794..4e8876430d04b5f67056d03a0723e752672b223d 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -432,6 +432,7 @@ int           tr_sessionIsProxyAuthEnabled   ( const tr_session * );
 const char*   tr_sessionGetProxy             ( const tr_session * );
 int           tr_sessionGetProxyPort         ( const tr_session * );
 tr_proxy_type tr_sessionGetProxyType         ( const tr_session * );
+const char*   tr_sessionGetProxyUsername     ( const tr_session * );
 const char*   tr_sessionGetProxyPassword     ( const tr_session * );
 void          tr_sessionSetProxyEnabled      ( tr_session *, int isEnabled );
 void          tr_sessionSetProxyAuthEnabled  ( tr_session *, int isEnabled );

diff --git a/libtransmission/utils-test.c b/libtransmission/utils-test.c
index 2f231f10d10d552248ae1e73316e7bc48554502f..be4266785f095a3cdd034bd0769db8e400138060 100644 (file)
--- a/libtransmission/utils-test.c
+++ b/libtransmission/utils-test.c
@@ -14,7 +14,7 @@
 #define NUM_LOOPS 200
 #endif
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \
     ++test; \