From bb6b471e8ba37af41dc3d8225240bf32a12c9fa8 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Fri, 18 Jul 2008 18:14:29 +0000
Subject: [PATCH] fix some minor errors reported by clang's "scan-build" tool

---
 gtk/actions.c                    | 20 +-------------------
 gtk/details.c                    |  1 -
 gtk/makemeta-ui.c                |  6 +++---
 gtk/sexy-icon-entry.c            |  4 ----
 gtk/tr-window.c                  |  2 --
 third-party/miniupnp/miniupnpc.c |  6 +++---
 6 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/gtk/actions.c b/gtk/actions.c
index 1c398a815..ec55802e7 100644
--- a/gtk/actions.c
+++ b/gtk/actions.c
@@ -133,21 +133,6 @@ static GtkActionEntry entries[] =
     N_("Ask Tracker for _More Peers"), NULL, NULL, G_CALLBACK(action_cb) }
 };
 
-static void
-ensure_tooltip (GtkActionEntry * e)
-{
-    if( !e->tooltip && e->label )
-    {
-        const char * src;
-        char *tgt;
-        e->tooltip = g_malloc( strlen( e->label ) + 1 );
-        for( src=e->label, tgt=(char*)e->tooltip; *src; ++src )
-            if( *src != '_' )
-                *tgt++ = *src;
-        *tgt++ = '\0';
-    }
-}
-
 typedef struct
 {
    const guint8* raw;
@@ -213,10 +198,7 @@ actions_init( GtkUIManager * ui_manager, gpointer callback_user_data )
 
   myUIManager = ui_manager;
 
-  register_my_icons ();
-
-  for( i=0; i<n_entries; ++i )
-    ensure_tooltip (&entries[i]);
+  register_my_icons( );
 
   action_group = myGroup = gtk_action_group_new( "Actions" );
   gtk_action_group_set_translation_domain( action_group, NULL );
diff --git a/gtk/details.c b/gtk/details.c
index 7f17ede75..71c747869 100644
--- a/gtk/details.c
+++ b/gtk/details.c
@@ -491,7 +491,6 @@ refresh_peers (GtkWidget * top)
   peers = tr_torrentPeers (tor, &n_peers);
   qsort (peers, n_peers, sizeof(tr_peer_stat), compare_peers);
 
-  i = 0;
   if (gtk_tree_model_get_iter_first (model, &iter)) do
   {
     char * addr = NULL;
diff --git a/gtk/makemeta-ui.c b/gtk/makemeta-ui.c
index 92eb4d47c..994b9f76f 100644
--- a/gtk/makemeta-ui.c
+++ b/gtk/makemeta-ui.c
@@ -308,7 +308,7 @@ GtkWidget*
 make_meta_ui( GtkWindow * parent, tr_handle * handle )
 {
     int row = 0;
-    GtkWidget *b1, *b2, *d, *t, *w, *h, *h2, *v, *focusMe, *extras;
+    GtkWidget *d, *t, *w, *h, *h2, *v, *focusMe, *extras;
     GtkBox * main_vbox;
     MakeMetaUI * ui = g_new0 ( MakeMetaUI, 1 );
     ui->handle = handle;
@@ -347,11 +347,11 @@ make_meta_ui( GtkWindow * parent, tr_handle * handle )
         gtk_box_pack_start( GTK_BOX( v ), h2, FALSE, FALSE, 0 );
         gtk_box_pack_start_defaults( GTK_BOX( h ), v );
         v = gtk_vbox_new( FALSE, GUI_PAD_SMALL );
-        w = b1 = tr_button_new_from_stock( GTK_STOCK_DIRECTORY, _( "F_older" ) );
+        w = tr_button_new_from_stock( GTK_STOCK_DIRECTORY, _( "F_older" ) );
         focusMe = w;
         g_signal_connect( w, "clicked", G_CALLBACK( onChooseDirectoryClicked ), ui );
         gtk_box_pack_start_defaults( GTK_BOX( v ), w );
-        w = b2 = tr_button_new_from_stock( GTK_STOCK_FILE, _( "_File" ) );
+        w = tr_button_new_from_stock( GTK_STOCK_FILE, _( "_File" ) );
         g_signal_connect( w, "clicked", G_CALLBACK( onChooseFileClicked ), ui );
         gtk_box_pack_start_defaults( GTK_BOX( v ), w );
         gtk_box_pack_start( GTK_BOX( h ), v, FALSE, FALSE, 0 );
diff --git a/gtk/sexy-icon-entry.c b/gtk/sexy-icon-entry.c
index 7dfa034ab..20c8f6d0b 100644
--- a/gtk/sexy-icon-entry.c
+++ b/gtk/sexy-icon-entry.c
@@ -89,14 +89,12 @@ sexy_icon_entry_class_init(SexyIconEntryClass *klass)
 	GObjectClass *gobject_class;
 	GtkObjectClass *object_class;
 	GtkWidgetClass *widget_class;
-	GtkEntryClass *entry_class;
 
 	parent_class = g_type_class_peek_parent(klass);
 
 	gobject_class = G_OBJECT_CLASS(klass);
 	object_class  = GTK_OBJECT_CLASS(klass);
 	widget_class  = GTK_WIDGET_CLASS(klass);
-	entry_class   = GTK_ENTRY_CLASS(klass);
 
 	gobject_class->finalize = sexy_icon_entry_finalize;
 
@@ -389,12 +387,10 @@ sexy_icon_entry_unrealize(GtkWidget *widget)
 static void
 sexy_icon_entry_size_request(GtkWidget *widget, GtkRequisition *requisition)
 {
-	GtkEntry *gtkentry;
 	SexyIconEntry *entry;
 	gint icon_widths = 0;
 	int i;
 
-	gtkentry = GTK_ENTRY(widget);
 	entry    = SEXY_ICON_ENTRY(widget);
 
 	for (i = 0; i < MAX_ICONS; i++)
diff --git a/gtk/tr-window.c b/gtk/tr-window.c
index df2978425..412909ae7 100644
--- a/gtk/tr-window.c
+++ b/gtk/tr-window.c
@@ -412,7 +412,6 @@ GtkWidget *
 tr_window_new( GtkUIManager * ui_manager, TrCore * core )
 {
     int i, n;
-    int status_stats_mode;
     const char * pch;
     PrivateData * p;
     GtkWidget *vbox, *w, *self, *h, *c, *s, *image, *menu;
@@ -496,7 +495,6 @@ tr_window_new( GtkUIManager * ui_manager, TrCore * core )
 
     /* status menu */
     menu = p->status_menu = gtk_menu_new( );
-    status_stats_mode = 0;
     l = NULL;
     pch = pref_string_get( PREF_KEY_STATUSBAR_STATS );
     for( i=0, n=G_N_ELEMENTS(stats_modes); i<n; ++i )
diff --git a/third-party/miniupnp/miniupnpc.c b/third-party/miniupnp/miniupnpc.c
index 6eff78953..554604422 100644
--- a/third-party/miniupnp/miniupnpc.c
+++ b/third-party/miniupnp/miniupnpc.c
@@ -141,7 +141,6 @@ int simpleUPnPcommand(int s, const char * url, const char * service,
 	char * path;
 	char soapact[128];
 	char soapbody[2048];
-	int soapbodylen;
 	char * buf;
 	int buffree;
     int n;
@@ -149,7 +148,7 @@ int simpleUPnPcommand(int s, const char * url, const char * service,
 	snprintf(soapact, sizeof(soapact), "%s#%s", service, action);
 	if(args==NULL)
 	{
-		/*soapbodylen = snprintf(soapbody, sizeof(soapbody),
+		/*snprintf(soapbody, sizeof(soapbody),
 						"<?xml version=\"1.0\"?>\r\n"
 	    	              "<SOAP-ENV:Envelope "
 						  "xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" "
@@ -158,7 +157,7 @@ int simpleUPnPcommand(int s, const char * url, const char * service,
 						  "<m:%s xmlns:m=\"%s\"/>"
 						  "</SOAP-ENV:Body></SOAP-ENV:Envelope>"
 					 	  "\r\n", action, service);*/
-		soapbodylen = snprintf(soapbody, sizeof(soapbody),
+		snprintf(soapbody, sizeof(soapbody),
 						"<?xml version=\"1.0\"?>\r\n"
 	    	              "<s:Envelope "
 						  "xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" "
@@ -173,6 +172,7 @@ int simpleUPnPcommand(int s, const char * url, const char * service,
 	{
 		char * p;
 		const char * pe, * pv;
+	        int soapbodylen;
 		soapbodylen = snprintf(soapbody, sizeof(soapbody),
 						"<?xml version=\"1.0\"?>\r\n"
 	    	            "<SOAP-ENV:Envelope "
-- 
2.40.0