2006-01-26 Robert Love <rml@novell.com>

* configure.in: Change '-Wno-unused' to '-Wno-unused-parameter'
	* gnome/applet/applet-compat.c, gnome/applet/applet-dbus-devices.c,
	  gnome/applet/applet-dbus-info.c, gnome/applet/applet-dbus.c,
	  gnome/applet/applet.c, gnome/applet/applet.h, src/nm-dbus-device.c,
	  gnome/applet/nm-gconf-wso-wep.c, gnome/applet/nm-gconf-wso-wpa-psk.c,
	  gnome/applet/nm-gconf-wso.c, gnome/applet/nm-gconf-wso.h,
	  gnome/applet/other-network-dialog.c, src/nm-device.c, test/nm-tool.c,
	  gnome/applet/passphrase-dialog.c, src/nm-device-802-11-wireless.c,
	  gnome/applet/wireless-security-manager.c, src/nm-ip4-config.c,
	  gnome/applet/wireless-security-option.c, src/nm-ap-security.c,
	  gnome/applet/wso-wep-ascii.c, gnome/applet/wso-wep-hex.c,
	  gnome/applet/wso-wep-passphrase.c, gnome/applet/wso-wpa-psk.c,
	  libnm-util/dbus-helpers.c, src/NetworkManagerAP.c, src/nm-dbus-nmi.c,
	  src/NetworkManagerSystem.c, src/nm-ap-security-wep.c,
	  src/nm-device-802-11-wireless.h, test/libnm-util/test-ciphers.c,
	  src/named-manager/nm-named-manager.c, test/test-common/test-common.c:
	  Kill unused variables, labels, and static functions.  Don't pass
	  string literals as the format string for printf-like functions.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1391 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

ChangeLog

@@ -1,3 +1,24 @@
+2006-01-26  Robert Love  <rml@novell.com>
+
+	* configure.in: Change '-Wno-unused' to '-Wno-unused-parameter'
+	* gnome/applet/applet-compat.c, gnome/applet/applet-dbus-devices.c,
+	  gnome/applet/applet-dbus-info.c, gnome/applet/applet-dbus.c,
+	  gnome/applet/applet.c, gnome/applet/applet.h, src/nm-dbus-device.c,
+	  gnome/applet/nm-gconf-wso-wep.c, gnome/applet/nm-gconf-wso-wpa-psk.c,
+	  gnome/applet/nm-gconf-wso.c, gnome/applet/nm-gconf-wso.h,
+	  gnome/applet/other-network-dialog.c, src/nm-device.c, test/nm-tool.c,
+	  gnome/applet/passphrase-dialog.c, src/nm-device-802-11-wireless.c,
+	  gnome/applet/wireless-security-manager.c, src/nm-ip4-config.c,
+	  gnome/applet/wireless-security-option.c, src/nm-ap-security.c,
+	  gnome/applet/wso-wep-ascii.c, gnome/applet/wso-wep-hex.c,
+	  gnome/applet/wso-wep-passphrase.c, gnome/applet/wso-wpa-psk.c,
+	  libnm-util/dbus-helpers.c, src/NetworkManagerAP.c, src/nm-dbus-nmi.c,
+	  src/NetworkManagerSystem.c, src/nm-ap-security-wep.c,
+	  src/nm-device-802-11-wireless.h, test/libnm-util/test-ciphers.c,
+	  src/named-manager/nm-named-manager.c, test/test-common/test-common.c:
+	  Kill unused variables, labels, and static functions.  Don't pass
+	  string literals as the format string for printf-like functions.
+
 2006-01-25  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/wireless-applet.glade

configure.in

@@ -262,7 +262,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
 	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
 		      -Wdeclaration-after-statement -Wstrict-prototypes \
-		      -Wfloat-equal -Wno-unused -Wno-sign-compare; do
+		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
 		AC_MSG_CHECKING([whether gcc understands $option])

gnome/applet/applet-compat.c

@@ -216,7 +216,6 @@ generic_convert_wep_entry (GConfClient *client,
 	int					key_item_id = -1;
 	int					real_we_cipher = IW_AUTH_CIPHER_WEP104;
 	IEEE_802_11_Cipher *	real_cipher = NULL;
-	int					ret;
 	char *				hashed_key = NULL;
 
 	g_return_if_fail (client != NULL);

gnome/applet/applet-dbus-devices.c

@@ -413,73 +413,6 @@ void nmwa_free_data_model (NMWirelessApplet *applet)
 }
 
 
-/*
- * nmwa_dbus_schedule_driver_notification
- *
- * Schedule the driver notification routine to run in the main loop.
- *
- */
-static void nmwa_dbus_schedule_driver_notification (NMWirelessApplet *applet, NetworkDevice *dev)
-{
-	DriverNotifyCBData	*cb_data;
-
-	g_return_if_fail (applet != NULL);
-	g_return_if_fail (dev != NULL);
-
-	cb_data = g_malloc0 (sizeof (DriverNotifyCBData));
-	cb_data->applet = applet;
-	network_device_ref (dev);
-	cb_data->dev = dev;
-
-	g_idle_add (nmwa_driver_notify, (gpointer)cb_data);
-}
-
-
-/*
- * nmwa_dbus_check_drivers
- *
- * If a device got added, we notify the user if the device's driver
- * has any problems (no carrier detect, no wireless scanning, etc).
- *
- */
-static void nmwa_dbus_check_drivers (NMWirelessApplet *applet)
-{
-	GSList	*elt;
-
-	g_return_if_fail (applet != NULL);
-
-	/* For every device that's in the dbus data model but not in
-	 * the gui data model, signal the user.
-	 */
-	for (elt = applet->device_list; elt; elt = g_slist_next (elt))
-	{
-		NetworkDevice	*dbus_dev = (NetworkDevice *)(elt->data);
-		GSList		*elt2;
-		gboolean		 found = FALSE;
-		
-		for (elt2 = applet->device_list; elt2; elt2 = g_slist_next (elt2))
-		{
-			NetworkDevice	*gui_dev = (NetworkDevice *)(elt2->data);
-
-			if (    !nm_null_safe_strcmp (network_device_get_iface (dbus_dev), network_device_get_iface (gui_dev))
-				&& !nm_null_safe_strcmp (network_device_get_address (dbus_dev), network_device_get_address (gui_dev))
-				&& !nm_null_safe_strcmp (network_device_get_hal_udi (dbus_dev), network_device_get_hal_udi (gui_dev)))
-			{
-				found = TRUE;
-				break;
-			}
-		}
-
-		if (!found)
-		{
-			if ((network_device_is_wired (dbus_dev) && !(network_device_get_capabilities (dbus_dev) & NM_DEVICE_CAP_CARRIER_DETECT))
-				|| (network_device_is_wireless (dbus_dev) && !(network_device_get_capabilities (dbus_dev) & NM_DEVICE_CAP_WIRELESS_SCAN)))
-				nmwa_dbus_schedule_driver_notification (applet, dbus_dev);
-		}
-	}
-}
-
-
 typedef struct NetPropCBData
 {
 	char *			dev_op;

gnome/applet/applet-dbus-info.c

@@ -46,9 +46,6 @@
 
 static DBusMessage * new_invalid_args_error (DBusMessage *message, const char *func)
 {
-	char *		msg;
-	DBusMessage *	reply;
-
 	g_return_val_if_fail (message != NULL, NULL);
 	g_return_val_if_fail (func != NULL, NULL);
 
@@ -108,7 +105,6 @@ static void nmi_dbus_get_network_key_callback (GnomeKeyringResult result,
 
 	if (result == GNOME_KEYRING_RESULT_OK)
 	{
-		gchar *			key;
 		gchar *			escaped_network;
 		GnomeKeyringFound *	found;
 		NMGConfWSO *		gconf_wso;
@@ -186,9 +182,6 @@ nmi_dbus_get_key_for_network (DBusConnection *connection,
 	/* It's not a new key, so try to get the key from the keyring. */
 	if (!new_key)
 	{
-		GnomeKeyringResult ret;
-		GList *found_list = NULL;
-		char *key = NULL;
 		NMGetNetworkKeyCBData *cb_data;
 
 		cb_data = g_malloc0 (sizeof (NMGetNetworkKeyCBData));
@@ -372,7 +365,6 @@ nmi_dbus_get_networks (DBusConnection *connection,
 		reply = nmu_create_dbus_error_message (message, NMI_DBUS_SERVICE, NO_NET_ERROR, NO_NET_ERROR_MSG);
 	}
 
-out:
 	return reply;
 }
 
@@ -403,7 +395,6 @@ nmi_dbus_get_network_properties (DBusConnection *connection,
 	char *			escaped_network = NULL;
 	char *			essid = NULL;
 	gint				timestamp = -1;
-	dbus_int32_t		dbus_int;
 	gboolean			trusted = FALSE;
 	DBusMessageIter 	iter, array_iter;
 	GConfClient *		client;
@@ -625,9 +616,7 @@ nmi_dbus_get_vpn_connection_properties (DBusConnection *connection,
 {
 	NMWirelessApplet *	applet = (NMWirelessApplet *) user_data;
 	DBusMessage *	reply = NULL;
-	gchar *		gconf_key = NULL;
 	char *		vpn_connection = NULL;
-	GConfValue *	value;
 	char *		escaped_name = NULL;
 	char *		name = NULL;
 	char *		service_name = NULL;
@@ -973,7 +962,6 @@ nmi_dbus_update_network_info (DBusConnection *connection,
 	NMWirelessApplet *	applet = (NMWirelessApplet *) user_data;
 	char *			essid = NULL;
 	gboolean			automatic;
-	dbus_bool_t		args_good;
 	NMGConfWSO *		gconf_wso = NULL;
 	DBusMessageIter	iter;
 	char *			bssid;

gnome/applet/applet-dbus.c

@@ -42,36 +42,6 @@
 #define	DBUS_NO_SERVICE_ERROR			"org.freedesktop.DBus.Error.ServiceDoesNotExist"
 
 
-/*
- * deal_with_dbus_error
- *
- * Ignore some common dbus errors
- *
- */
-static int deal_with_dbus_error (const char *function, const char *method, DBusError *error)
-{
-	int	ret = RETURN_FAILURE;
-
-	if (!strcmp (error->name, DBUS_NO_SERVICE_ERROR))
-		ret = RETURN_NO_NM;
-	else if (!strcmp (error->name, NM_DBUS_NO_ACTIVE_NET_ERROR))
-		ret = RETURN_SUCCESS;
-	else if (!strcmp (error->name, NM_DBUS_NO_ACTIVE_DEVICE_ERROR))
-		ret = RETURN_SUCCESS;
-	else if (!strcmp (error->name, NM_DBUS_NO_NETWORKS_ERROR))
-		ret = RETURN_SUCCESS;
-	else if (!strcmp (error->name, NM_DBUS_NO_ACTIVE_VPN_CONNECTION))
-		ret = RETURN_SUCCESS;
-	else if (!strcmp (error->name, NM_DBUS_NO_VPN_CONNECTIONS))
-		ret = RETURN_SUCCESS;
-
-	if ((ret != RETURN_SUCCESS) && (ret != RETURN_NO_NM))
-		nm_warning ("%s(): %s raised on method '%s':\n %s\n\n", function, error->name, method, error->message);
-
-	return ret;
-}
-
-
 /*
  * nmwa_dbus_filter
  *

gnome/applet/applet.c

@@ -78,7 +78,7 @@ static void		nmwa_context_menu_update (NMWirelessApplet *applet);
 static GtkWidget *	nmwa_get_instance (NMWirelessApplet *applet);
 static void		nmwa_update_state (NMWirelessApplet *applet);
 static void		nmwa_dropdown_menu_deactivate_cb (GtkWidget *menu, NMWirelessApplet *applet);
-
+static GType		nmwa_get_type (void);	/* for G_DEFINE_TYPE */
 
 G_DEFINE_TYPE(NMWirelessApplet, nmwa, EGG_TYPE_TRAY_ICON)
 
@@ -178,7 +178,7 @@ static void nmwa_show_socket_err (GtkWidget *info_dialog, const char *err)
 
 	msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
 	                       _("Error displaying connection information: "), err);
-	error_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (info_dialog), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg);
+	error_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (info_dialog), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg);
 	g_free (msg);
 	gtk_window_present (GTK_WINDOW (error_dialog));
 	g_signal_connect_swapped (error_dialog, "response", G_CALLBACK (gtk_widget_destroy), error_dialog);
@@ -859,7 +859,6 @@ static void nmwa_set_icon (NMWirelessApplet *applet, GdkPixbuf *link_icon, GdkPi
 		gdk_pixbuf_composite (vpn_icon, composite, 0, 0, gdk_pixbuf_get_width (vpn_icon),
 							gdk_pixbuf_get_height (vpn_icon), 0, 0, 1.0, 1.0, GDK_INTERP_NEAREST, 255);
 
-out:
 	gtk_image_set_from_pixbuf (GTK_IMAGE (applet->pixmap), composite);
 
 	/* Add some padding to the applet to ensure the
@@ -2457,7 +2456,8 @@ static void nmwa_gconf_vpn_connections_notify_callback (GConfClient *client, gui
  * Destroy the applet and clean up its data
  *
  */
-static void nmwa_destroy (NMWirelessApplet *applet, gpointer user_data)
+static void G_GNUC_NORETURN
+nmwa_destroy (NMWirelessApplet *applet, gpointer user_data)
 {
 	if (applet->dropdown_menu)
 		nmwa_dropdown_menu_clear (applet->dropdown_menu);

gnome/applet/applet.h

@@ -53,8 +53,6 @@ enum NMWAEncryptionKeyTypes
 	KEY_TYPE_HEX_KEY = 2
 };
 
-static GType nmwa_get_type (void); /* prototype for G_DEFINE_TYPE */
-
 #define NM_TYPE_WIRELESS_APPLET			(nmwa_get_type())
 #define NM_WIRELESS_APPLET(object)			(G_TYPE_CHECK_INSTANCE_CAST((object), NM_TYPE_WIRELESS_APPLET, NMWirelessApplet))
 #define NM_WIRELESS_APPLET_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_WIRELESS_APPLET, NMWirelessAppletClass))

gnome/applet/nm-gconf-wso-wep.c

@@ -49,7 +49,6 @@ nm_gconf_wso_wep_new_deserialize_dbus (DBusMessageIter *iter, int we_cipher)
 	char *			key = NULL;
 	int				key_len;
 	int				auth_algorithm;
-	DBusMessageIter	subiter;
 
 	g_return_val_if_fail (iter != NULL, NULL);
 	g_return_val_if_fail ((we_cipher == IW_AUTH_CIPHER_WEP40) || (we_cipher == IW_AUTH_CIPHER_WEP104), NULL);
@@ -71,8 +70,6 @@ NMGConfWSOWEP *
 nm_gconf_wso_wep_new_deserialize_gconf (GConfClient *client, const char *network, int we_cipher)
 {
 	NMGConfWSOWEP *	security = NULL;
-	char *			key = NULL;
-	int				key_len;
 	int				auth_algorithm;
 
 	g_return_val_if_fail (client != NULL, NULL);

gnome/applet/nm-gconf-wso-wpa-psk.c

@@ -73,8 +73,6 @@ NMGConfWSOWPA_PSK *
 nm_gconf_wso_wpa_psk_new_deserialize_gconf (GConfClient *client, const char *network, int we_cipher)
 {
 	NMGConfWSOWPA_PSK *	security = NULL;
-	char *				key;
-	int					key_len;
 	int					wpa_version;
 	int					key_mgt;
 

gnome/applet/nm-gconf-wso.c

@@ -255,7 +255,6 @@ nm_gconf_wso_serialize_gconf (NMGConfWSO *self,
                               GConfClient *client,
                               const char *network)
 {
-	dbus_int32_t	dbus_we_cipher;
 	char *		key;
 
 	g_return_val_if_fail (self != NULL, FALSE);

gnome/applet/nm-gconf-wso.h

@@ -66,8 +66,6 @@ NMGConfWSO * nm_gconf_wso_new_deserialize_dbus (DBusMessageIter *iter);
 
 NMGConfWSO * nm_gconf_wso_new_deserialize_gconf (GConfClient *client, const char *network);
 
-NMGConfWSO * nm_gconf_wso_new_deserialize_gconf (GConfClient *client, const char *network);
-
 NMGConfWSO * nm_gconf_wso_new_from_wso (WirelessSecurityOption *opt, const char *ssid);
 
 int nm_gconf_wso_get_we_cipher (NMGConfWSO *self);

gnome/applet/other-network-dialog.c

@@ -91,7 +91,6 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
  */
 static void nmwa_ond_device_combo_changed (GtkWidget *dev_combo, gpointer user_data)
 {
-	int			choice;
 	GtkDialog *	dialog = (GtkDialog *) user_data;
 	WirelessSecurityManager * wsm;
 	GtkWidget *	wso_widget;
@@ -150,7 +149,6 @@ static void nmwa_ond_device_combo_changed (GtkWidget *dev_combo, gpointer user_d
  */
 static void nmwa_ond_security_combo_changed (GtkWidget *combo, gpointer user_data)
 {
-	int			choice;
 	GtkDialog *	dialog = (GtkDialog *) user_data;
 	WirelessSecurityManager * wsm;
 	GtkWidget *	wso_widget;
@@ -403,8 +401,6 @@ static void nmwa_ond_response_cb (GtkDialog *dialog, gint response, gpointer dat
 	{
 		GtkEntry *	network_name_entry;
 		const char *	essid = NULL;
-		const char *	key = NULL;
-		int			key_type = -1;
 
 		network_name_entry = GTK_ENTRY (glade_xml_get_widget (xml, "network_name_entry"));
 		essid = gtk_entry_get_text (network_name_entry);

gnome/applet/passphrase-dialog.c

@@ -80,7 +80,6 @@ static void update_button_cb (GtkWidget *unused, GtkDialog *dialog)
  */
 static void nmi_passphrase_dialog_security_combo_changed (GtkWidget *security_combo, gpointer user_data)
 {
-	int			choice;
 	GtkDialog *	dialog = (GtkDialog *) user_data;
 	WirelessSecurityManager * wsm;
 	GtkWidget *	wso_widget;
@@ -130,7 +129,6 @@ nmi_passphrase_dialog_response_received (GtkWidget *dialog,
 {
 	NMWirelessApplet *	applet;
 	GladeXML *		xml;
-	GtkEntry *		entry;
 	GtkComboBox *		security_combo;
 	DBusMessage *		message;
 	WirelessSecurityManager *wsm;
@@ -190,7 +188,6 @@ nmi_passphrase_dialog_new (NMWirelessApplet *applet,
 {
 	GtkWidget *				dialog;
 	GtkButton *				ok_button;
-	GtkEntry *				entry;
 	GtkWidget *				label;
 	GladeXML *				xml;
 	WirelessSecurityManager *	wsm;

gnome/applet/wireless-security-manager.c

@@ -104,7 +104,6 @@ void wsm_update_combo (WirelessSecurityManager *wsm, GtkComboBox *combo)
 {
 	GtkListStore *	model;
 	GSList *		elt;
-	gboolean		ret = FALSE;
 
 	g_return_if_fail (wsm != NULL);
 	g_return_if_fail (combo != NULL);
@@ -174,8 +173,6 @@ gboolean wsm_validate_active (WirelessSecurityManager *wsm, GtkComboBox *combo,
 
 WirelessSecurityOption * wsm_get_option_for_active (WirelessSecurityManager *wsm, GtkComboBox *combo)
 {
-	WirelessSecurityOption * opt = NULL;
-
 	g_return_val_if_fail (wsm != NULL, NULL);
 	g_return_val_if_fail (combo != NULL, NULL);
 

gnome/applet/wireless-security-option.c

@@ -147,7 +147,6 @@ void wso_wep_auth_combo_setup (WirelessSecurityOption *opt, GtkComboBox * combo)
 {
 	GtkListStore *	model;
 	GtkTreeIter	iter;
-	char *		label;
 
 	g_return_if_fail (opt != NULL);
 	g_return_if_fail (combo != NULL);
@@ -185,7 +184,6 @@ int wso_wep_auth_combo_get_auth_alg (WirelessSecurityOption *opt, GtkComboBox *
 void wso_wep_auth_combo_cleanup (WirelessSecurityOption *opt, GtkComboBox * combo)
 {
 	GtkListStore * model;
-	char *		label;
 
 	g_return_if_fail (opt != NULL);
 	g_return_if_fail (combo != NULL);
@@ -200,7 +198,6 @@ wso_wpa_create_key_type_model (int capabilities,
                                int *num_added)
 {
 	GtkListStore *	model;
-	GSList *		elt;
 	GtkTreeIter	iter;
 	int			num = 0;
 

gnome/applet/wso-wep-ascii.c

@@ -119,7 +119,6 @@ static gboolean append_dbus_params_func (WirelessSecurityOption *opt, const char
 WirelessSecurityOption * wso_wep_ascii_new (const char *glade_file)
 {
 	WirelessSecurityOption * opt = NULL;
-	GladeXML *			xml = NULL;
 	OptData *				data = NULL;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);

gnome/applet/wso-wep-hex.c

@@ -116,7 +116,6 @@ static gboolean append_dbus_params_func (WirelessSecurityOption *opt, const char
 WirelessSecurityOption * wso_wep_hex_new (const char *glade_file)
 {
 	WirelessSecurityOption * opt = NULL;
-	GladeXML *			xml = NULL;
 	OptData *				data = NULL;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);

gnome/applet/wso-wep-passphrase.c

@@ -116,7 +116,6 @@ static gboolean append_dbus_params_func (WirelessSecurityOption *opt, const char
 WirelessSecurityOption * wso_wep_passphrase_new (const char *glade_file)
 {
 	WirelessSecurityOption * opt = NULL;
-	GladeXML *			xml = NULL;
 	OptData *				data = NULL;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);

gnome/applet/wso-wpa-psk.c

@@ -99,8 +99,6 @@ append_dbus_params_func (WirelessSecurityOption *opt,
                          DBusMessage *message)
 {
 	IEEE_802_11_Cipher *	cipher = NULL;
-	GtkWidget *			auth_combo;
-	int					auth_alg = -1;
 	GtkWidget *			entry;
 	const char *			input;
 
@@ -157,7 +155,6 @@ wso_wpa_psk_new (const char *glade_file,
                  gboolean wpa2)
 {
 	WirelessSecurityOption * opt = NULL;
-	GladeXML *			xml = NULL;
 	OptData *				data = NULL;
 	GtkWidget *			key_type_combo;
 	int					num_added;

libnm-util/dbus-helpers.c

@@ -63,7 +63,6 @@ nmu_security_deserialize_wep (DBusMessageIter *iter,
 						int *auth_alg)
 {
 	char *			dbus_key;
-	int				dbus_key_len;
 	dbus_int32_t		dbus_auth_alg;
 
 	g_return_val_if_fail (iter != NULL, FALSE);
@@ -170,7 +169,6 @@ nmu_security_deserialize_wpa_psk (DBusMessageIter *iter,
 						int *key_mgt)
 {
 	char *			dbus_key;
-	int				dbus_key_len;
 	dbus_int32_t		dbus_wpa_version;
 	dbus_int32_t		dbus_key_mgt;
 

src/NetworkManagerAP.c

@@ -603,8 +603,6 @@ void nm_ap_add_capabilities_from_ie (NMAccessPoint *ap, const guint8 *wpa_ie, gu
 
 void nm_ap_add_capabilities_for_wep (NMAccessPoint *ap)
 {
-	guint32		caps;
-
 	g_return_if_fail (ap != NULL);
 
 	ap->capabilities |= (NM_802_11_CAP_PROTO_WEP | NM_802_11_CAP_CIPHER_WEP40 | NM_802_11_CAP_CIPHER_WEP104);

src/NetworkManagerSystem.c

@@ -139,8 +139,6 @@ gboolean nm_system_device_set_from_ip4_config (NMDevice *dev)
 	NMIP4Config *		config;
 	struct nl_handle *	nlh = NULL;
 	struct rtnl_addr *	addr = NULL;
-	int				i = -1;
-	gboolean			success = FALSE;
 	int				err;
 
 	g_return_val_if_fail (dev != NULL, FALSE);

src/named-manager/nm-named-manager.c

@@ -556,9 +556,6 @@ static gboolean
 remove_ip4_config_from_named (NMNamedManager *mgr, NMIP4Config *config)
 {
 	const char *domain;
-	DBusMessage *	message;
-	DBusMessage *	reply;
-	DBusError		error;
 
 	g_return_val_if_fail (mgr != NULL, FALSE);
 	g_return_val_if_fail (config != NULL, FALSE);

src/nm-ap-security-wep.c

@@ -57,7 +57,6 @@ nm_ap_security_wep_new_deserialize (DBusMessageIter *iter, int we_cipher)
 	char *			key = NULL;
 	int				key_len;
 	int				auth_algorithm;
-	DBusMessageIter	subiter;
 
 	g_return_val_if_fail (iter != NULL, NULL);
 	g_return_val_if_fail ((we_cipher == IW_AUTH_CIPHER_WEP40) || (we_cipher == IW_AUTH_CIPHER_WEP104), NULL);
@@ -113,7 +112,6 @@ real_write_supplicant_config (NMAPSecurity *instance,
                               int nwid,
                               gboolean user_created)
 {
-	NMAPSecurityWEP *	self = NM_AP_SECURITY_WEP (instance);
 	gboolean			success = FALSE;
 	char *			msg = NULL;
 	const char *		key = nm_ap_security_get_key (instance);

src/nm-ap-security.c

@@ -288,8 +288,6 @@ nm_ap_security_new_copy (NMAPSecurity *self)
 void
 nm_ap_security_copy_properties (NMAPSecurity *self, NMAPSecurity *dst)
 {
-	int	key_len;
-
 	g_return_if_fail (self != NULL);
 	g_return_if_fail (dst != NULL);
 	g_return_if_fail (self != dst);

src/nm-dbus-device.c

@@ -337,7 +337,7 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
 	{
 		char *			op = nm_dbus_get_object_path_for_device (dev);
 		const char *		iface = nm_device_get_iface (dev);
-		dbus_uint32_t		type = (dbus_uint32_t) nm_device_get_device_type (dev);
+		dbus_uint32_t		type = nm_device_get_device_type (dev);
 		const char *		udi = nm_device_get_udi (dev);
 		gchar *			ip4_address;
 		gchar *			broadcast;

src/nm-dbus-nmi.c

@@ -540,7 +540,7 @@ static void nm_dbus_get_networks_cb (DBusPendingCall *pcall, void *user_data)
 		/* Get properties on each network */
 		if ((message = dbus_message_new_method_call (NMI_DBUS_SERVICE, NMI_DBUS_PATH, NMI_DBUS_INTERFACE, "getNetworkProperties")))
 		{
-			dbus_int32_t			type_as_int32 = (dbus_int32_t) nm_ap_list_get_type (cb_data->list);
+			dbus_int32_t			type_as_int32 = nm_ap_list_get_type (cb_data->list);
 			DBusPendingCall *		net_pcall = NULL;
 
 			dbus_message_append_args (message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INT32, &type_as_int32, DBUS_TYPE_INVALID);
@@ -577,7 +577,7 @@ out:
 void nm_dbus_update_allowed_networks (DBusConnection *connection, NMAccessPointList *list, NMData *data)
 {
 	DBusMessage *		message;
-	dbus_int32_t		type_as_int32 = (dbus_int32_t) nm_ap_list_get_type (list);
+	dbus_int32_t		type_as_int32 = nm_ap_list_get_type (list);
 	DBusPendingCall *	pcall = NULL;
 
 	g_return_if_fail (connection != NULL);

src/nm-device-802-11-wireless.c

@@ -98,17 +98,6 @@ typedef struct
 
 
 static void	nm_device_802_11_wireless_ap_list_clear (NMDevice80211Wireless *self);
-void	nm_device_802_11_wireless_set_essid (NMDevice80211Wireless *self,
-                                                    const char *essid);
-char *		nm_device_802_11_wireless_get_essid (NMDevice80211Wireless *self);
-void			nm_device_802_11_wireless_get_bssid (NMDevice80211Wireless *self,
-                                                    struct ether_addr *bssid);
-void			nm_device_802_11_wireless_set_wep_enc_key (NMDevice80211Wireless *self,
-                                                         const char *key,
-                                                         int auth_method);
-
-gboolean	nm_device_802_11_wireless_set_mode (NMDevice80211Wireless *self,
-									 const int mode);
 
 static gboolean nm_device_802_11_wireless_scan (gpointer user_data);
 
@@ -138,10 +127,8 @@ static void		remove_link_timeout (NMDevice80211Wireless *self);
 static guint32
 real_get_generic_capabilities (NMDevice *dev)
 {
-	NMDevice80211Wireless *	wdev;
 	NMSock *			sk;
 	int				err;
-	wireless_scan_head	scan_data;
 	guint32			caps = NM_DEVICE_CAP_NONE;
 	iwrange			range;
 	struct iwreq		wrq;
@@ -230,11 +217,9 @@ static void
 real_init (NMDevice *dev)
 {
 	NMDevice80211Wireless *	self = NM_DEVICE_802_11_WIRELESS (dev);
-	NMDevice80211WirelessClass *	klass;
 	NMData *				app_data;
 	guint32				caps;
 	NMSock *				sk;
-	NMDeviceClass *		parent_class;
 
 	self->priv->scan_mutex = g_mutex_new ();
 	nm_register_mutex_desc (self->priv->scan_mutex, "Scan Mutex");
@@ -258,7 +243,6 @@ real_init (NMDevice *dev)
 	{
 		struct iw_range range;
 		struct iwreq wrq;
-		int minlen = ((char *) &range.enc_capa) - (char *) &range + sizeof (range.enc_capa);
 
 		memset (&wrq, 0, sizeof (wrq));
 		strncpy (wrq.ifr_name, nm_device_get_iface (NM_DEVICE (self)), IFNAMSIZ);
@@ -646,9 +630,7 @@ nm_device_802_11_wireless_get_activation_ap (NMDevice80211Wireless *self,
                                              const char *essid,
                                              NMAPSecurity *security)
 {
-	gboolean			 encrypted = FALSE;
 	NMAccessPoint		*ap = NULL;
-	NMAccessPoint		*tmp_ap = NULL;
 	NMData *			app_data;
 	NMAccessPointList *	dev_ap_list;
 
@@ -703,25 +685,6 @@ nm_device_802_11_wireless_get_activation_ap (NMDevice80211Wireless *self,
 }
 
 
-/*
- * nm_device_802_11_wireless_ap_list_add_ap
- *
- * Add an access point to the devices internal AP list.
- *
- */
-static void
-nm_device_802_11_wireless_ap_list_add_ap (NMDevice80211Wireless *self,
-                                          NMAccessPoint *ap)
-{
-	g_return_if_fail (self != NULL);
-	g_return_if_fail (ap != NULL);
-
-	nm_ap_list_append_ap (self->priv->ap_list, ap);
-	/* Transfer ownership of ap to the list by unrefing it here */
-	nm_ap_unref (ap);
-}
-
-
 /*
  * nm_device_802_11_wireless_ap_list_clear
  *
@@ -1823,11 +1786,9 @@ nm_device_802_11_wireless_scan (gpointer user_data)
 		iface = nm_device_get_iface (NM_DEVICE (self));
 		if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL)))
 		{
-			int			err;
 			int			orig_mode = IW_MODE_INFRA;
 			double		orig_freq = 0;
 			int			orig_rate = 0;
-			const int		interval = 20;
 			struct iwreq	wrq;
 
 			orig_mode = nm_device_802_11_wireless_get_mode (self);
@@ -2301,7 +2262,6 @@ static gboolean
 link_timeout_cb (gpointer user_data)
 {
 	NMDevice *			dev = NM_DEVICE (user_data);
-	NMDevice80211Wireless *	self = NM_DEVICE_802_11_WIRELESS (user_data);
 
 	g_assert (dev);
 
@@ -2441,7 +2401,6 @@ static gboolean
 supplicant_interface_init (NMDevice80211Wireless *self)
 {
 	struct wpa_ctrl *	ctrl;
-	struct wpa_ctrl *	ctrl_if = NULL;
 	char *			socket_path;
 	const char *		iface = nm_device_get_iface (NM_DEVICE (self));
 	gboolean			success = FALSE;
@@ -2561,7 +2520,6 @@ supplicant_monitor_start (NMDevice80211Wireless *self)
 	int			fd = -1;
 	GIOChannel *	channel;
 	GMainContext *	context;
-	NMData *		data = nm_device_get_app_data (NM_DEVICE (self));
 
 	g_return_val_if_fail (self != NULL, FALSE);
 
@@ -2769,7 +2727,6 @@ real_activation_success_handler (NMDevice *dev,
 	NMDevice80211Wireless *	self = NM_DEVICE_802_11_WIRELESS (dev);
 	struct ether_addr	addr;
 	NMAccessPoint *	ap = nm_act_request_get_ap (req);
-	NMAccessPoint *	tmp_ap;
 	gboolean			automatic;
 	NMData *			app_data;
 
@@ -2799,7 +2756,6 @@ static void
 real_activation_failure_handler (NMDevice *dev,
                                  NMActRequest *req)
 {
-	NMDevice80211Wireless *	self = NM_DEVICE_802_11_WIRELESS (dev);
 	NMData *			app_data;
 	NMAccessPoint *	ap;
 
@@ -2820,7 +2776,6 @@ real_activation_failure_handler (NMDevice *dev,
 static gboolean
 real_can_interrupt_activation (NMDevice *dev)
 {
-	NMDevice80211Wireless *	self = NM_DEVICE_802_11_WIRELESS (dev);
 	NMActRequest *			req;
 	gboolean interrupt = FALSE;
 
@@ -2876,7 +2831,6 @@ nm_device_802_11_wireless_dispose (GObject *object)
 static void
 nm_device_802_11_wireless_finalize (GObject *object)
 {
-	NMDevice80211Wireless *		self = NM_DEVICE_802_11_WIRELESS (object);
 	NMDevice80211WirelessClass *	klass = NM_DEVICE_802_11_WIRELESS_GET_CLASS (object);
 	NMDeviceClass *			parent_class;  
 
@@ -3003,7 +2957,7 @@ get_scan_results (NMDevice80211Wireless *dev,
 {
 	struct iwreq iwr;
 	guint8 *res_buf;
-	size_t len, res_buf_len = IW_SCAN_MAX_DATA;
+	size_t res_buf_len = IW_SCAN_MAX_DATA;
 	guint8 tries = 0;
 	gboolean success = FALSE;
 

src/nm-device-802-11-wireless.h

@@ -87,6 +87,11 @@ void nm_device_802_11_wireless_set_address (NMDevice80211Wireless *dev);
 void			nm_device_802_11_wireless_get_bssid (NMDevice80211Wireless *dev,
                                                     struct ether_addr *bssid);
 
+char *		nm_device_802_11_wireless_get_essid (NMDevice80211Wireless *self);
+
+gboolean		nm_device_802_11_wireless_set_mode (NMDevice80211Wireless *self,
+										 const int mode);
+
 NMAccessPoint *	nm_device_802_11_wireless_get_best_ap (NMDevice80211Wireless *dev);
 
 NMAccessPoint *	nm_device_802_11_wireless_get_activation_ap (NMDevice80211Wireless *dev,

src/nm-device.c

@@ -653,8 +653,6 @@ nm_device_activate_stage1_device_prepare (NMActRequest *req)
 {
 	NMDevice *	self;
 	NMData *		data;
-	NMAccessPoint *ap;
-	NMAPSecurity *	security;
 	const char *	iface;
 	NMActStageReturn	ret;
 
@@ -1007,7 +1005,6 @@ nm_device_activate_stage4_ip_config_get (NMActRequest *req)
 {
 	NMData *			data = NULL;
 	NMDevice *		self = NULL;
-	NMAccessPoint *	ap = NULL;
 	NMIP4Config *		ip4_config = NULL;
 	NMActStageReturn	ret;
 

src/nm-ip4-config.c

@@ -329,8 +329,6 @@ guint32 nm_ip4_config_get_num_domains (NMIP4Config *config)
 
 /* libnl convenience/conversion functions */
 
-extern void rtnl_addr_set_prefixlen (struct rtnl_addr *, int);
-
 static int ip4_addr_to_rtnl_local (guint32 ip4_address, struct rtnl_addr *addr)
 {
 	struct nl_addr * local = NULL;

test/libnm-util/test-ciphers.c

@@ -61,7 +61,6 @@ static void test_inputs (IEEE_802_11_Cipher *cipher, const char *test, int selec
 #define ESSID	"ThisIsASSID"
 	struct Inputs * input = &test_input[selector];
 	char *output;
-	char *correct_output;
 
 	/* Underrun */
 	if ((ieee_802_11_cipher_validate (cipher, ESSID, input->underrun)) != -1)

test/nm-tool.c

@@ -283,7 +283,6 @@ static void detail_device (DBusConnection *connection, const char *path)
 		/* Wireless specific information */
 		if (type == DEVICE_TYPE_802_11_WIRELESS)
 		{
-			char *str_strength;
 			int	 i;
 
 			printf ("\n  Wireless Settings\n");

test/test-common/test-common.c

@@ -53,7 +53,7 @@ test_result (const char *progname,
 		result_string = "SUCCEED";
 
 	full_msg = g_strdup_printf ("%s: (%s) %s %s\n", progname, test, result_string, errmsg ? errmsg : "");
-	fprintf (stderr, full_msg);
+	fprintf (stderr, "%s", full_msg);
 	g_free (full_msg);
 	g_free (errmsg);