Changeset 6489

Timestamp:

Aug 11, 2008, 7:05:00 PM (14 years ago)

Author:

charles

Message:

(1.3x) lots of C correctness tweaks suggested by sparse/cgcc

Location:

branches/1.3x

Files:

• cli/cli.c (modified) (2 diffs)
• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)
• gtk/actions.c (modified) (4 diffs)
• gtk/actions.h (modified) (1 diff)
• gtk/details.c (modified) (1 diff)
• gtk/main.c (modified) (3 diffs)
• gtk/tr-core.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (2 diffs)
• gtk/tr-torrent.c (modified) (1 diff)
• gtk/tr-window.c (modified) (3 diffs)
• gtk/ui.h (modified) (1 diff)
• libtransmission/bencode-test.c (modified) (1 diff)
• libtransmission/bencode.c (modified) (1 diff)
• libtransmission/blocklist.c (modified) (1 diff)
• libtransmission/clients.c (modified) (1 diff)
• libtransmission/fdlimit.c (modified) (1 diff)
• libtransmission/handshake.c (modified) (1 diff)
• libtransmission/json-test.c (modified) (1 diff)
• libtransmission/json.c (modified) (1 diff)
• libtransmission/makemeta.c (modified) (1 diff)
• libtransmission/peer-msgs.c (modified) (1 diff)
• libtransmission/ptrarray.c (modified) (1 diff)
• libtransmission/rpc-test.c (modified) (1 diff)
• libtransmission/rpc.c (modified) (1 diff)
• libtransmission/stats.c (modified) (2 diffs)
• libtransmission/tracker.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• libtransmission/utils-test.c (modified) (1 diff)

branches/1.3x/cli/cli.c

@@ -66 +66 @@
 static void sigHandler       ( int signal );
 
-char*
+static char*
 tr_strlratio( char * buf, double ratio, size_t buflen )
 {
@@ -438 +438 @@
 }
 
-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 },

branches/1.3x/daemon/daemon.c

@@ -232 +232 @@
 }
 
-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 },

branches/1.3x/daemon/remote.c

@@ -683 +683 @@
                         char sizestr[64];
                         double percent = (double)have / length;
+                        const char * pristr;
                         strlsize( sizestr, length, sizeof( sizestr ) );
-                        const char * pristr;
                         switch( priority ) {
                             case TR_PRI_LOW:    pristr = "Low"; break;

branches/1.3x/gtk/actions.c

@@ -15 +15 @@
 #include <gtk/gtk.h>
 #include <libtransmission/transmission.h>
+#include "actions.h"
 #include "conf.h"
 #include "tr-core.h"
@@ -23 +24 @@
 #define UNUSED G_GNUC_UNUSED
 
-extern void doAction (const char * action_name, gpointer user_data );
-
-static TrCore * myCore = 0;
-
-static GtkActionGroup * myGroup = 0;
+static TrCore * myCore = NULL;
+
+static GtkActionGroup * myGroup = NULL;
 
 static void
@@ -141 +140 @@
 BuiltinIconInfo;
 
-const BuiltinIconInfo my_fallback_icons [] =
+static const BuiltinIconInfo my_fallback_icons [] =
 {
     { tr_icon_logo, "transmission" },
@@ -166 +165 @@
             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 );

branches/1.3x/gtk/actions.h

@@ -29 +29 @@
 GtkWidget* action_get_widget ( const char * path );
 
+void doAction( const char * action_name, gpointer user_data );
+
 #endif

branches/1.3x/gtk/details.c

@@ -1166 +1166 @@
 };
 
-GtkWidget*
+static GtkWidget*
 tracker_page_new( TrTorrent * gtor )
 {

branches/1.3x/gtk/main.c

@@ -411 +411 @@
     if( didlock && ( didinit || cf_init( configDir, &err ) ) )
     {
+        GtkWindow * win;
+
         tr_handle * h = tr_sessionInitFull(
                             configDir,
@@ -445 +447 @@
 
         /* 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 );
@@ -1048 +1050 @@
 }
 
-gboolean
+static gboolean
 updatemodel( gpointer gdata )
 {

branches/1.3x/gtk/tr-core.c

@@ -1040 +1040 @@
     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 ) {

branches/1.3x/gtk/tr-prefs.c

@@ -271 +271 @@
 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" );
@@ -419 +422 @@
     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 );

branches/1.3x/gtk/tr-torrent.c

@@ -228 +228 @@
 tr_torrent_status_str ( TrTorrent * gtor )
 {
-    char * top = 0;
+    char * top = NULL;
 
     const tr_stat * st = tr_torrent_stat( gtor );

branches/1.3x/gtk/tr-window.c

@@ -102 +102 @@
 #define FILTER_TOGGLES_KEY "tr-filter-toggles"
 
-PrivateData*
+static PrivateData*
 get_private_data( TrWindow * w )
 {
@@ -225 +225 @@
 {
     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( ) );
 }
 
@@ -402 +402 @@
 {
     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( ) );
 }
 

branches/1.3x/gtk/ui.h

@@ -1 @@
-const char * fallback_ui_file =
+static const char * fallback_ui_file =
 "<ui>\n"
 "  <menubar name='main-window-menu'>\n"

branches/1.3x/libtransmission/bencode-test.c

@@ -8 +8 @@
 #define VERBOSE 0
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \

branches/1.3x/libtransmission/bencode.c

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

branches/1.3x/libtransmission/blocklist.c

@@ -81 +81 @@
     }
 
-    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) );

branches/1.3x/libtransmission/clients.c

@@ -21 +21 @@
 
 #include "transmission.h"
+#include "clients.h"
 #include "utils.h"
 

branches/1.3x/libtransmission/fdlimit.c

@@ -48 +48 @@
 
 #include "transmission.h"
+#include "fdlimit.h"
 #include "list.h"
 #include "net.h"

branches/1.3x/libtransmission/handshake.c

@@ -970 +970 @@
 }
 
-void
+static void
 tr_handshakeDone( tr_handshake * handshake, int isOK )
 {

branches/1.3x/libtransmission/json-test.c

@@ -7 +7 @@
 #define VERBOSE 0
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \

branches/1.3x/libtransmission/json.c

@@ -22 +22 @@
 #include "transmission.h"
 #include "bencode.h"
+#include "json.h"
 #include "ptrarray.h"
 #include "utils.h"

branches/1.3x/libtransmission/makemeta.c

@@ -383 +383 @@
             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 );

branches/1.3x/libtransmission/peer-msgs.c

@@ -1975 +1975 @@
 }
 
-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,

branches/1.3x/libtransmission/ptrarray.c

@@ -183 +183 @@
 **/
 
-int
+static int
 tr_ptrArrayLowerBound( const tr_ptrArray * t,
                        const void        * ptr,

branches/1.3x/libtransmission/rpc-test.c

@@ -8 +8 @@
 #define VERBOSE 0
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \

branches/1.3x/libtransmission/rpc.c

@@ -643 +643 @@
 typedef const char* (handler)( tr_handle*, tr_benc*, tr_benc* );
 
-struct method {
+static struct method {
     const char * name;
     handler * func;

branches/1.3x/libtransmission/stats.c

@@ -16 +16 @@
 #include "bencode.h"
 #include "platform.h" /* tr_sessionGetConfigDir() */
+#include "stats.h"
 #include "utils.h" /* tr_buildPath */
 
@@ -170 +171 @@
 {
     const struct tr_stats_handle * stats = getStats( handle );
+    tr_session_stats current;
     assert( stats );
-    tr_session_stats current;
     tr_sessionGetStats( handle, &current );
     addStats( setme, &stats->old, &current );

branches/1.3x/libtransmission/tracker.c

@@ -155 +155 @@
 ***/
 
-tr_tracker *
+static tr_tracker *
 findTracker( tr_session * session, const uint8_t * hash )
 {
@@ -323 +323 @@
     {
         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 ) )
@@ -467 +468 @@
     {
         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 ) )
         {

branches/1.3x/libtransmission/transmission.h

@@ -433 +433 @@
 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 );

branches/1.3x/libtransmission/utils-test.c

@@ -15 +15 @@
 #endif
 
-int test = 0;
+static int test = 0;
 
 #define check(A) { \