GNOME.org
 

[gnome-nettool] Cleanup of warning messages at compiling time

commit 2266b25fe3c247b9ccab33d39a53899f3e7c4397
Author: GermÃn Poo-CaamaÃo <gpoo gnome org>
Date:   Sat Dec 31 23:30:44 2011 -0800

    Cleanup of warning messages at compiling time
    
    Signed-off-by: GermÃn Poo-CaamaÃo <gpoo gnome org>

 src/finger.c            |    3 ---
 src/gn-combo-history.c  |    2 +-
 src/info.c              |    4 +---
 src/main.c              |   18 ------------------
 src/netstat.c           |   25 ++++++++++---------------
 src/netstat.h           |    1 -
 src/ping.c              |    2 +-
 src/scan.c              |   10 ++++++----
 src/traceroute.c        |    2 +-
 src/util-mii-wireless.h |   10 +++++-----
 src/util-mii.c          |    8 +++-----
 src/utils.c             |    2 +-
 12 files changed, 29 insertions(+), 58 deletions(-)
---
diff --git a/src/finger.c b/src/finger.c
index 8d5f1c1..9af76e7 100644
--- a/src/finger.c
+++ b/src/finger.c
@@ -47,7 +47,6 @@ finger_do (Netinfo * netinfo)
 	const gchar *user = NULL;
 	gchar *command = NULL;
 	gchar *program = NULL;
-	GtkWidget *parent;
 
 	gchar **command_line;
 	gchar **command_options;
@@ -81,8 +80,6 @@ finger_do (Netinfo * netinfo)
 	gtk_text_buffer_get_bounds (buffer, &start, &end);
 	gtk_text_buffer_delete (buffer, &start, &end);
 
-	parent = gtk_widget_get_toplevel (netinfo->output);
-
 	program = util_find_program_in_path ("finger", NULL);
 
 	if (program == NULL) {
diff --git a/src/gn-combo-history.c b/src/gn-combo-history.c
index 9cd7662..9dd3296 100644
--- a/src/gn-combo-history.c
+++ b/src/gn-combo-history.c
@@ -225,7 +225,7 @@ static void
 gn_combo_history_settings_load (GnComboHistory *history)
 {
 	gchar **items;
-	gint i;
+	guint i;
 
 	g_return_if_fail (GN_IS_COMBO_HISTORY (history));
 	g_return_if_fail (history->priv->id != NULL);
diff --git a/src/info.c b/src/info.c
index 2d8af75..11ebc0f 100644
--- a/src/info.c
+++ b/src/info.c
@@ -213,7 +213,6 @@ static gboolean
 info_nic_update_stats (gpointer data)
 {
 	Netinfo *info = data;
-	GtkTreeModel *model;
 	gchar rx_pkt[10], rx_error[10];
 	gchar tx_pkt[10], tx_error[10];
 	gchar collisions[10];
@@ -224,7 +223,6 @@ info_nic_update_stats (gpointer data)
 
 	g_return_val_if_fail (info != NULL, FALSE);
 
-	model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo));
 	nic = info_get_nic (info);
 	if (!nic)
 		return FALSE;
@@ -522,7 +520,7 @@ info_get_interfaces (Netinfo *info)
 	glibtop_netlist netlist;
 	gchar **devices;
 	gchar *iface;
-	gint i;
+	guint i;
 
 	devices = glibtop_get_netlist(&netlist);
 
diff --git a/src/main.c b/src/main.c
index 21c9b59..af35c98 100644
--- a/src/main.c
+++ b/src/main.c
@@ -265,7 +265,6 @@ Netinfo *
 load_ping_widgets_from_builder (GtkBuilder * builder)
 {
 	Netinfo *pinger;
-	GtkWidget *vbox_ping;
 	GtkWidget *label;
 	GtkEntry  *entry_host;
 	GtkTreeModel *model;
@@ -303,8 +302,6 @@ load_ping_widgets_from_builder (GtkBuilder * builder)
 	pinger->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
 	pinger->stbar_text = NULL;
 
-	vbox_ping = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_ping"));
-
 	label = GTK_WIDGET (gtk_builder_get_object (builder, "ping_host_label"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), pinger->host);
 	
@@ -352,7 +349,6 @@ Netinfo *
 load_traceroute_widgets_from_builder (GtkBuilder * builder)
 {
 	Netinfo *tracer;
-	GtkWidget *vbox_traceroute;
 	GtkWidget *label;
 	GtkEntry  *entry_host;
 	GtkTreeModel *model;
@@ -382,8 +378,6 @@ load_traceroute_widgets_from_builder (GtkBuilder * builder)
 
 	tracer->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
 	tracer->stbar_text = NULL;
-	
-	vbox_traceroute = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_traceroute"));
 
 	label = GTK_WIDGET (gtk_builder_get_object (builder, "traceroute_host_label"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), tracer->host);
@@ -425,7 +419,6 @@ Netinfo *
 load_netstat_widgets_from_builder (GtkBuilder * builder)
 {
 	Netinfo *netstat;
-	GtkWidget *vbox_netstat;
 
 	g_return_val_if_fail (builder != NULL, NULL);
 
@@ -452,8 +445,6 @@ load_netstat_widgets_from_builder (GtkBuilder * builder)
 	netstat->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
 	netstat->stbar_text = NULL;
 	
-	vbox_netstat = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_netstat"));
-	
 	netstat->button_callback = G_CALLBACK (on_netstat_activate);
 	netstat->process_line = NETINFO_FOREACH_FUNC (netstat_foreach_with_tree);
 	netstat->copy_output = NETINFO_COPY_FUNC (netstat_copy_to_clipboard);	
@@ -715,7 +706,6 @@ Netinfo *
 load_lookup_widgets_from_builder (GtkBuilder * builder)
 {
 	Netinfo *lookup;
-	GtkWidget *vbox_lookup;
 	GtkWidget *label;
 	GtkEntry  *entry_host;
 	GtkTreeModel *model;
@@ -746,8 +736,6 @@ load_lookup_widgets_from_builder (GtkBuilder * builder)
 
 	lookup->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
 	lookup->stbar_text = NULL;
-	
-	vbox_lookup = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_lookup"));
 
 	label = GTK_WIDGET (gtk_builder_get_object (builder, "lookup_host_label"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), lookup->host);
@@ -794,7 +782,6 @@ Netinfo *
 load_finger_widgets_from_builder (GtkBuilder * builder)
 {
 	Netinfo *finger;
-	GtkWidget *vbox_finger;
 	GtkWidget *label;
 	PangoFontDescription *font_desc;
 	GtkEntry  *entry_host;
@@ -827,8 +814,6 @@ load_finger_widgets_from_builder (GtkBuilder * builder)
 
 	finger->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
 	finger->stbar_text = NULL;
-	
-	vbox_finger = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_finger"));
 
 	label = GTK_WIDGET (gtk_builder_get_object (builder, "finger_user_label"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), finger->user);
@@ -902,7 +887,6 @@ Netinfo *
 load_whois_widgets_from_builder (GtkBuilder * builder)
 {
 	Netinfo *whois;
-	GtkWidget *vbox_whois;
 	GtkWidget *label;
 	GtkEntry  *entry_host;
 	GtkTreeModel *model;
@@ -935,8 +919,6 @@ load_whois_widgets_from_builder (GtkBuilder * builder)
 	whois->status_bar = GTK_WIDGET (gtk_builder_get_object (builder, "statusbar"));
 	whois->stbar_text = NULL;
 
-	vbox_whois = GTK_WIDGET (gtk_builder_get_object (builder, "vbox_whois"));
-
 	label = GTK_WIDGET (gtk_builder_get_object (builder, "whois_host_label"));
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), whois->host);
 
diff --git a/src/netstat.c b/src/netstat.c
index b6c8a42..1aceb57 100644
--- a/src/netstat.c
+++ b/src/netstat.c
@@ -20,8 +20,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
- 
-#include <string.h>
+
+#include <strings.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "netstat.h"
@@ -52,14 +52,14 @@ void clean_gtk_tree_view (GtkTreeView *widget);
 void
 on_protocol_button_toggled (GtkToggleButton *togglebutton, gpointer user_data)
 {
-	GtkTreeView *widget;
 	Netinfo *netinfo = user_data;
-	/* GtkWidget *parent, *child; */
+	/* GtkWidget *parent, *child, *widget; */
 	
 	g_return_if_fail (GTK_IS_TREE_VIEW (netinfo->output));
+
+	/*
 	widget = GTK_TREE_VIEW (netinfo->output);
 	
-	/*
 	parent = gtk_widget_get_parent (GTK_WIDGET (widget));
 	g_print ("name: %s\n", gtk_widget_get_name (parent));
 	child = gtk_bin_get_child (GTK_BIN (parent));
@@ -232,19 +232,19 @@ netstat_foreach (Netinfo * netinfo, gchar * line, gsize len, gpointer user_data)
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (netinfo->output));
 	gtk_text_buffer_get_end_iter (buffer, &iter);
 
+#ifdef DEBUG
 	if (netstat_get_active_option2 (netinfo) == PROTOCOL) {
 		netstat_protocol_data data;
 		gint count;
 		
 		count = strip_protocol_line (line, &data);
-#ifdef DEBUG
 		if (count == 7 || count == 8) {
 
 			g_print ("%s\t%s:%s\t%s\n", data.protocol,
 				data.ip_src, data.port_src, data.state);
 		}
-#endif /* DEBUG */
 	}
+#endif /* DEBUG */
 
 	if (len > 0) {
 		text_utf8 = g_locale_to_utf8 (line, len,
@@ -277,7 +277,6 @@ netstat_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len,
 	GtkTreeView *widget;
 
 	g_return_if_fail (netinfo != NULL);
-	//g_return_if_fail (line != NULL);
 
 	widget = (GTK_TREE_VIEW (netinfo->output));
 
@@ -629,7 +628,6 @@ strip_route_line (gchar * line, netstat_route_data *data)
 	return count;
 }
 
-//static GtkTreeModel *
 void
 netstat_create_route_model (GtkTreeView *widget)
 {
@@ -756,12 +754,11 @@ strip_multicast_line (gchar * line, netstat_multicast_data *data)
 			data->iface,
 			&members, data->group);
 
-	snprintf ((data)->members, 30, "%d", members);
+	g_snprintf ((data)->members, 30, "%d", members);
 	
 	return count;
 }
 
-//static GtkTreeModel *
 void 
 netstat_create_multicast_model (GtkTreeView *widget)
 {
@@ -796,14 +793,12 @@ netstat_create_multicast_model (GtkTreeView *widget)
 void
 clean_gtk_tree_view (GtkTreeView *widget)
 {
-	GList *columns, *list;
+	GList *columns;
 	gint n, i;
 	GtkTreeViewColumn *column;
 	
 	columns = gtk_tree_view_get_columns (widget);
-	
-	list = columns;
-	
+
 	n = g_list_length (columns);
 	
 	for (i = n; i > 0; i--) {
diff --git a/src/netstat.h b/src/netstat.h
index fd04729..bff8db6 100644
--- a/src/netstat.h
+++ b/src/netstat.h
@@ -54,7 +54,6 @@ struct _netstat_protocol_data {
 	gchar protocol[30];
 	gchar ip_src[50];
 	gchar port_src[30];
-//	gint  port_src;
 	gchar state[30];
 };
 
diff --git a/src/ping.c b/src/ping.c
index ffe8470..22a8dfb 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -37,7 +37,7 @@ enum {
 	IP_COLUMN,
 	ICMP_SEQ_COLUMN,
 	SRTT_COLUMN,
-	UNIT_COLUMN,
+	UNIT_COLUMN
 };
 
 static gint strip_line (gchar * line, ping_data * data, Netinfo * netinfo);
diff --git a/src/scan.c b/src/scan.c
index 5a946df..fdba546 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -36,7 +36,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <unistd.h>
-#include <string.h>
+#include <strings.h>
 
 #include "scan.h"
 #include "utils.h"
@@ -77,6 +77,7 @@ scan_do (Netinfo * netinfo)
 	gint ip_version, pf;
 	struct sockaddr *addr_ptr;
 	gint size;
+	gint ret;
 
 	g_return_if_fail (netinfo != NULL);
 
@@ -150,7 +151,7 @@ scan_do (Netinfo * netinfo)
 
 			if (ip_version == IPV4) {
 				addr.sin_family = PF_INET;
-				bcopy (hp->h_addr, &addr.sin_addr, hp->h_length);
+				bcopy (hp->h_addr_list[0], &addr.sin_addr, hp->h_length);
 				addr.sin_port = htons (i);
 				addr_ptr = (struct sockaddr *) &addr;
 				size = sizeof (addr);
@@ -158,7 +159,7 @@ scan_do (Netinfo * netinfo)
 			else {
 				addr6.sin6_family = PF_INET6;
 				addr6.sin6_flowinfo = 0;
-				bcopy (hp->h_addr, &addr6.sin6_addr, hp->h_length);
+				bcopy (hp->h_addr_list[0], &addr6.sin6_addr, hp->h_length);
 				addr6.sin6_port = htons (i);
 				addr_ptr = (struct sockaddr *) &addr6;
 				size = sizeof (addr6);
@@ -176,7 +177,8 @@ scan_do (Netinfo * netinfo)
 				/* Translators: "open" is a network status and should be one word. */
 				g_sprintf (buf, "%d %s %s\n", i, _("open"), service_name);
 				g_free (service_name);
-				write (pfd[1], buf, strlen (buf));
+				ret = write (pfd[1], buf, strlen (buf));
+				g_warn_if_fail (ret != -1);
 			}
 			/* close (sock); */
 			g_io_channel_shutdown (channel, FALSE, NULL);
diff --git a/src/traceroute.c b/src/traceroute.c
index bfdd11c..46f340a 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -78,7 +78,7 @@ traceroute_do (Netinfo * netinfo)
 		program = util_find_program_in_path ("tcptraceroute", NULL);
 #ifdef DEBUG
 		g_print ("tcptraceroute: %s\n", program);
-#endif /* DEBUG */
+#endif
 		if (program != NULL) {
 			program_name = g_strdup ("tcptraceroute");
 		} else {
diff --git a/src/util-mii-wireless.h b/src/util-mii-wireless.h
index 0471d65..181a89d 100644
--- a/src/util-mii-wireless.h
+++ b/src/util-mii-wireless.h
@@ -10,12 +10,10 @@
  * Copyright (c) 1997-2002 Jean Tourrilhes, All Rights Reserved.
  */
 
-//#ifndef _LINUX_WIRELESS_H
-//#define _LINUX_WIRELESS_H
-
 #include <sys/ioctl.h>
 
-/*#include <linux/if.h>*/			/* for IFNAMSIZ and co... */
+#ifdef __linux__
+#include <linux/if.h>		/* for IFNAMSIZ and co... */
 
 /* Some useful constants */
 #define KILO	1e3
@@ -56,7 +54,7 @@ struct	iw_param
  */
 struct	iw_point
 {
-  caddr_t	pointer;	/* Pointer to the data  (in user space) */
+  void  *	pointer;	/* Pointer to the data  (in user space) */
   __u16		length;		/* number of fields or size in bytes */
   __u16		flags;		/* Optional params */
 };
@@ -148,3 +146,5 @@ struct	iwreq
 	/* Data part (defined just above) */
 	union	iwreq_data	u;
 };
+
+#endif
diff --git a/src/util-mii.c b/src/util-mii.c
index ed699c0..6c523c6 100644
--- a/src/util-mii.c
+++ b/src/util-mii.c
@@ -48,7 +48,8 @@
 #include <glib/gprintf.h>
 
 #include <errno.h>
-#include <net/if.h>
+#include <sys/socket.h>
+
 #ifndef __GLIBC__
 #include <linux/if_arp.h>
 #include <linux/if_ether.h>
@@ -85,7 +86,7 @@ mdio_read (int skfd, int location)
 
 const struct {
 	char *name;
-	u_short value;
+	unsigned short value;
 } media[] = {
 	/* The order through 100baseT4 matches bits in the BMSR */
 	{
@@ -174,8 +175,6 @@ mii_get_basic (const char *ifname)
 	int bmcr, bmsr, advert, lkpar;
 	unsigned short autonegotiate = 0;
 	mii_data_result data;
-	struct mii_data *mii = (struct mii_data *) &ifr.ifr_data;
-	int phy_id;
 	int sock;
 
 	memset (data.iface, 0, 100);
@@ -203,7 +202,6 @@ mii_get_basic (const char *ifname)
 		close (sock);
 		return data;
 	}
-	phy_id = mii->phy_id;
 	data.has_data = 1;
 	
 	/* Some bits in the BMSR are latched, but we can't rely on being
diff --git a/src/utils.c b/src/utils.c
index d34aa89..a97217f 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -148,7 +148,7 @@ output_foreach (GtkTreeModel * model, GtkTreePath * path,
 
 	/* Get values from each colum */
 	for (j = 0; j < columns; j++) {
-		GValue value = { 0, };
+		GValue value = G_VALUE_INIT;
 		gchar *svalue;
 		gint ivalue;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]