diff --git a/ChangeLog b/ChangeLog index 7b8e5e463..a4d73e6b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-01-11 Robert Love + + * configure.in: Add the gcc flags '-Wshadow' and '-Wfloat-equal'. + * gnome/applet/applet.c, gnome/vpn-properties/nm-vpn-properties.c, + src/NetworkManagerAPList.c, src/NetworkManagerDbus.c, + src/NetworkManagerPolicy.c, src/NetworkManagerSystem.c, + src/nm-dbus-device.c, src/nm-device-802-3-ethernet.c, + src/nm-ip4-config.c, src/vpn-manager/nm-vpn-manager.c, + test/nmtestdevices.c: Fix shadowed variable usage as appropriate. + * src/nm-device-802-11-wireless.c: Fix floating point comparison by + comparing values within DBL_EPSILON. Also fix shadowed variable + usage. + 2006-01-11 Dan Williams Add options for WPA2 and WPA1+CCMP (AES). @@ -10,7 +23,7 @@ and don't allow creation of WPA2 Ad-Hoc networks since wpa_supplicant doesn't support them - * gnome/applet/wireless-security-manager.c + * gnome/applet/wireless-security-manager.c - (wsm_set_capabilities): Add WPA2 options, and pass capability on to the specific wireless security option being created diff --git a/configure.in b/configure.in index 23a1282e9..4fad95b08 100644 --- a/configure.in +++ b/configure.in @@ -260,9 +260,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then AC_MSG_RESULT(yes) CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS" - for option in -Wno-unused -Wno-sign-compare -Wmissing-declarations \ + for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \ -Wdeclaration-after-statement -Wstrict-prototypes \ - -Wmissing-prototypes; do + -Wfloat-equal -Wno-unused -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index ef44d4dcb..ab54d446c 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -269,10 +269,10 @@ static void nmwa_show_info_cb (GtkMenuItem *mi, NMWirelessApplet *applet) } static void about_dialog_activate_link_cb (GtkAboutDialog *about, - const gchar *link, + const gchar *url, gpointer data) { - gnome_url_show (link, NULL); + gnome_url_show (url, NULL); } static void nmwa_about_cb (NMWirelessApplet *applet) diff --git a/gnome/vpn-properties/nm-vpn-properties.c b/gnome/vpn-properties/nm-vpn-properties.c index 07dd0a86e..952b15190 100644 --- a/gnome/vpn-properties/nm-vpn-properties.c +++ b/gnome/vpn-properties/nm-vpn-properties.c @@ -262,17 +262,10 @@ static gboolean vpn_druid_vpn_type_page_next (GnomeDruidPage *druidpage, } static void vpn_druid_vpn_details_page_prepare (GnomeDruidPage *druidpage, - GtkWidget *widget, - gpointer user_data) + GtkWidget *widget, + gpointer user_data) { - /*printf ("vpn_details_prepare!\n");*/ - - gnome_druid_set_buttons_sensitive (druid, - TRUE, - FALSE, - TRUE, - FALSE); - + gnome_druid_set_buttons_sensitive (druid, TRUE, FALSE, TRUE, FALSE); } static gboolean vpn_druid_vpn_details_page_next (GnomeDruidPage *druidpage, @@ -339,11 +332,8 @@ static gboolean vpn_druid_vpn_confirm_page_finish (GnomeDruidPage *druidpage, return FALSE; } -static gboolean vpn_druid_cancel (GnomeDruid *druid, - gpointer user_data) +static gboolean vpn_druid_cancel (GnomeDruid *ignored_druid, gpointer user_data) { - /*printf ("vpn_druid_cancel!\n");*/ - gtk_widget_hide_all (GTK_WIDGET (druid_window)); return FALSE; } @@ -357,21 +347,19 @@ add_cb (GtkButton *button, gpointer user_data) GList *i; GList *children; - /*printf ("add_cb\n");*/ - /* Bail out if we don't have any VPN implementations on our system */ if (vpn_types == NULL || g_slist_length (vpn_types) == 0) { - GtkWidget *dialog; + GtkWidget *err_dialog; - dialog = gtk_message_dialog_new (NULL, + err_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Cannot add VPN connection")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), _("No suitable VPN software was found on your system. Contact your system administrator.")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_dialog_run (GTK_DIALOG (err_dialog)); + gtk_widget_destroy (err_dialog); goto out; } @@ -413,20 +401,20 @@ import_settings (const char *svc_name, const char *name) /* Bail out if we don't have the requested VPN implementation on our system */ if (vpn_ui == NULL) { char *basename; - GtkWidget *dialog; + GtkWidget *err_dialog; basename = g_path_get_basename (name); - dialog = gtk_message_dialog_new (NULL, + err_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Cannot import VPN connection")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), _("Cannot find suitable software for VPN connection type '%s' to import the file '%s'. Contact your system administrator."), svc_name, basename); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_dialog_run (GTK_DIALOG (err_dialog)); + gtk_widget_destroy (err_dialog); g_free (basename); goto out; } @@ -443,7 +431,6 @@ import_settings (const char *svc_name, const char *name) w = glade_xml_get_widget (xml, "vpn-druid-vpn-details-page"); gnome_druid_set_page (druid, GNOME_DRUID_PAGE (w)); - /* show appropriate child */ w = vpn_ui->get_widget (vpn_ui, NULL, NULL, NULL); if (w != NULL) { @@ -465,6 +452,7 @@ import_settings (const char *svc_name, const char *name) gtk_window_set_policy (druid_window, FALSE, FALSE, TRUE); gtk_widget_show_all (GTK_WIDGET (druid_window)); + out: ; } @@ -557,19 +545,19 @@ retrieve_data_from_selected_connection (NetworkManagerVpnUI **vpn_ui, *vpn_ui = find_vpn_ui_by_service_name (conn_service_name); if (*vpn_ui == NULL) { - GtkWidget *dialog; + GtkWidget *err_dialog; - dialog = gtk_message_dialog_new (NULL, + err_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Error retrieving VPN connection '%s'"), *conn_name); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Could not find the UI files for VPN connection type '%s'. Contact your system administrator."), - conn_service_name); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), + _("Could not find the UI files for VPN connection type '%s'. Contact your system administrator."), + conn_service_name); + gtk_dialog_run (GTK_DIALOG (err_dialog)); + gtk_widget_destroy (err_dialog); goto out; } @@ -581,9 +569,9 @@ retrieve_data_from_selected_connection (NetworkManagerVpnUI **vpn_ui, *conn_vpn_data = NULL; for (i = conn_vpn_data_gconfvalue; i != NULL; i = g_slist_next (i)) { - const char *value; - value = gconf_value_get_string ((GConfValue *) i->data); - *conn_vpn_data = g_slist_append (*conn_vpn_data, (gpointer) value); + const char *val; + val = gconf_value_get_string ((GConfValue *) i->data); + *conn_vpn_data = g_slist_append (*conn_vpn_data, (gpointer) val); } @@ -596,9 +584,9 @@ retrieve_data_from_selected_connection (NetworkManagerVpnUI **vpn_ui, conn_routes_gconfvalue = gconf_value_get_list (value); *conn_routes = NULL; for (i = conn_routes_gconfvalue; i != NULL; i = g_slist_next (i)) { - const char *value; - value = gconf_value_get_string ((GConfValue *) i->data); - *conn_routes = g_slist_append (*conn_routes, (gpointer) value); + const char *val; + val = gconf_value_get_string ((GConfValue *) i->data); + *conn_routes = g_slist_append (*conn_routes, (gpointer) val); } result = TRUE; @@ -710,7 +698,7 @@ delete_cb (GtkButton *button, gpointer user_data) GtkTreeSelection *selection; gchar *conn_gconf_path; gchar *conn_name; - GtkWidget *dialog; + GtkWidget *confirm_dialog; int response; /*printf ("delete\n");*/ @@ -722,16 +710,16 @@ delete_cb (GtkButton *button, gpointer user_data) goto out; gtk_tree_model_get (GTK_TREE_MODEL (vpn_conn_list), &iter, VPNCONN_NAME_COLUMN, &conn_name, -1); - dialog = gtk_message_dialog_new (NULL, + confirm_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, _("Delete VPN connection \"%s\"?"), conn_name); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK, NULL); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + gtk_dialog_add_buttons (GTK_DIALOG (confirm_dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK, NULL); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (confirm_dialog), _("All information about the VPN connection \"%s\" will be lost and you may need your system administrator to provide information to create a new connection."), conn_name); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + response = gtk_dialog_run (GTK_DIALOG (confirm_dialog)); + gtk_widget_destroy (confirm_dialog); if (response != GTK_RESPONSE_OK) goto out; @@ -872,7 +860,7 @@ vpn_list_cursor_changed_cb (GtkTreeView *treeview, extern NetworkManagerVpnUI* vpn_ui_factory_dummy (void); static void -load_properties_module (GSList **vpn_types, const char *path) +load_properties_module (GSList **vpn_types_list, const char *path) { GModule *module; NetworkManagerVpnUI* (*nm_vpn_properties_factory) (void) = NULL; @@ -900,7 +888,7 @@ load_properties_module (GSList **vpn_types, const char *path) goto out; } - *vpn_types = g_slist_append (*vpn_types, impl); + *vpn_types_list = g_slist_append (*vpn_types_list, impl); out: ; @@ -929,17 +917,17 @@ init_app (void) xml = glade_xml_new (glade_file, NULL, NULL); g_free (glade_file); if (!xml) { - GtkWidget *dialog; + GtkWidget *err_dialog; - dialog = gtk_message_dialog_new (NULL, + err_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Unable to load")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (err_dialog), _("Cannot find some needed resources (the glade file)!")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_dialog_run (GTK_DIALOG (err_dialog)); + gtk_widget_destroy (err_dialog); return FALSE; } @@ -1000,11 +988,8 @@ init_app (void) gtk_signal_connect_after (GTK_OBJECT (vpn_conn_view), "cursor-changed", GTK_SIGNAL_FUNC (vpn_list_cursor_changed_cb), NULL); - get_all_vpn_connections (); - - column = gtk_tree_view_column_new (); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, TRUE); @@ -1130,7 +1115,7 @@ main (int argc, char *argv[]) } if (do_import) { - import_settings (import_svc, import_file); + import_settings (import_svc, import_file); } gtk_main (); diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c index 83cbb3915..b1aeff84d 100644 --- a/src/NetworkManagerAPList.c +++ b/src/NetworkManagerAPList.c @@ -604,7 +604,6 @@ void nm_ap_list_diff (NMData *data, NMDevice80211Wireless *dev, NMAccessPointLis { NMAPListIter *iter; NMAccessPoint *old_ap; - NMAccessPoint *new_ap; g_return_if_fail (data != NULL); g_return_if_fail (dev != NULL); @@ -614,7 +613,7 @@ void nm_ap_list_diff (NMData *data, NMDevice80211Wireless *dev, NMAccessPointLis { while ((old_ap = nm_ap_list_iter_next (iter))) { - NMAccessPoint *new_ap = NULL; + NMAccessPoint *new_ap; if (nm_ap_get_essid (old_ap)) { @@ -635,6 +634,8 @@ void nm_ap_list_diff (NMData *data, NMDevice80211Wireless *dev, NMAccessPointLis */ if (new && (iter = nm_ap_list_iter_new (new))) { + NMAccessPoint *new_ap; + while ((new_ap = nm_ap_list_iter_next (iter))) { if (!nm_ap_get_matched (new_ap) && nm_ap_get_essid (new_ap)) diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c index 8ae2e8870..9c2fc123d 100644 --- a/src/NetworkManagerDbus.c +++ b/src/NetworkManagerDbus.c @@ -209,7 +209,7 @@ static gboolean nm_dbus_signal_device_status_change (gpointer user_data) NMStatusChangeData *cb_data = (NMStatusChangeData *)user_data; DBusMessage * message; char * dev_path; - const char * signal = NULL; + const char * sig = NULL; int i = 0; g_return_val_if_fail (cb_data->data, FALSE); @@ -219,13 +219,13 @@ static gboolean nm_dbus_signal_device_status_change (gpointer user_data) while ((dev_status_signals[i].status != DEVICE_STATUS_INVALID) && (dev_status_signals[i].status != cb_data->status)) i++; - if (!(signal = dev_status_signals[i].signal)) + if (!(sig = dev_status_signals[i].signal)) return FALSE; if (!(dev_path = nm_dbus_get_object_path_for_device (cb_data->dev))) return FALSE; - if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, signal))) + if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, sig))) { nm_warning ("nm_dbus_signal_device_status_change(): Not enough memory for new dbus message!"); g_free (dev_path); @@ -352,7 +352,7 @@ void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevic DBusMessage * message; char * dev_path = NULL; char * net_path = NULL; - const char * signal = NULL; + const char * sig = NULL; g_return_if_fail (connection != NULL); g_return_if_fail (dev != NULL); @@ -367,25 +367,25 @@ void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevic switch (status) { case NETWORK_STATUS_DISAPPEARED: - signal = "WirelessNetworkDisappeared"; + sig = "WirelessNetworkDisappeared"; break; case NETWORK_STATUS_APPEARED: - signal = "WirelessNetworkAppeared"; + sig = "WirelessNetworkAppeared"; break; case NETWORK_STATUS_STRENGTH_CHANGED: - signal = "WirelessNetworkStrengthChanged"; + sig = "WirelessNetworkStrengthChanged"; break; default: break; } - if (!signal) + if (!sig) { nm_warning ("nm_dbus_signal_wireless_network_change(): tried to broadcast unknown signal."); goto out; } - if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, signal))) + if (!(message = dbus_message_new_signal (NM_DBUS_PATH, NM_DBUS_INTERFACE, sig))) { nm_warning ("nm_dbus_signal_wireless_network_change(): Not enough memory for new dbus message!"); goto out; diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index 66ea45c40..fcce115c3 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -380,15 +380,15 @@ static gboolean nm_policy_device_change_check (NMData *data) * from Ad-Hoc APs either. */ gboolean same_essid = (strcmp (old_essid, new_essid) == 0); - gboolean link = nm_device_has_active_link (old_dev); - if ((!same_essid || !link) && (old_mode != IW_MODE_ADHOC)) + gboolean have_link = nm_device_has_active_link (old_dev); + if ((!same_essid || !have_link) && (old_mode != IW_MODE_ADHOC)) { nm_info ("SWITCH: found better connection '%s/%s'" " than current connection '%s/%s'. " "same_ssid=%d, have_link=%d", nm_device_get_iface (new_dev), new_essid, nm_device_get_iface (old_dev), old_essid, - same_essid, link); + same_essid, have_link); do_switch = TRUE; } } /* Always prefer Ethernet over wireless, unless the user explicitly switched away. */ diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c index 057a5349a..f1f311596 100644 --- a/src/NetworkManagerSystem.c +++ b/src/NetworkManagerSystem.c @@ -96,17 +96,17 @@ static void iface_to_rtnl_index (const char *iface, struct nl_handle *nlh, struc static struct rtnl_link * iface_to_rtnl_link (const char *iface, struct nl_handle *nlh) { struct nl_cache * cache = NULL; - struct rtnl_link * link = NULL; + struct rtnl_link * have_link = NULL; g_return_val_if_fail (iface != NULL, NULL); g_return_val_if_fail (nlh != NULL, NULL); if ((cache = get_link_cache (nlh))) - link = rtnl_link_get_by_name (cache, iface); + have_link = rtnl_link_get_by_name (cache, iface); else nm_warning ("iface_to_rtnl_link() couldn't allocate link cache."); - return link; + return have_link; } diff --git a/src/nm-dbus-device.c b/src/nm-dbus-device.c index 29351cb6a..d21e7e689 100644 --- a/src/nm-dbus-device.c +++ b/src/nm-dbus-device.c @@ -312,12 +312,12 @@ static DBusMessage *nm_dbus_device_set_link_active (DBusConnection *connection, else if ((reply = dbus_message_new_method_return (message))) { DBusError error; - gboolean link; + gboolean have_link; dbus_error_init (&error); - if (dbus_message_get_args (message, &error, DBUS_TYPE_BOOLEAN, &link, DBUS_TYPE_INVALID)) + if (dbus_message_get_args (message, &error, DBUS_TYPE_BOOLEAN, &have_link, DBUS_TYPE_INVALID)) { - nm_device_set_active_link (dev, link); + nm_device_set_active_link (dev, have_link); nm_policy_schedule_device_change_check (data->data); } } @@ -419,7 +419,6 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D if ((iter = nm_ap_list_iter_new (ap_list))) { int i = 0; - NMAccessPoint * ap; networks = g_malloc0 (sizeof (char *) * (num_networks + 1)); while ((ap = nm_ap_list_iter_next (iter))) diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 17a2bf557..7af628ac0 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -464,7 +464,7 @@ link_to_specific_ap (NMDevice80211Wireless *self, NMAccessPoint *ap, gboolean default_link) { - gboolean link = FALSE; + gboolean have_link = FALSE; /* Checking hardware's ESSID during a scan is doesn't work. */ nm_lock_mutex (self->priv->scan_mutex, __func__); @@ -477,20 +477,20 @@ link_to_specific_ap (NMDevice80211Wireless *self, if (dev_essid && ap_essid && !strcmp (dev_essid, ap_essid)) { self->priv->failed_link_count = 0; - link = TRUE; + have_link = TRUE; } } nm_unlock_mutex (self->priv->scan_mutex, __func__); - if (!link) + if (!have_link) { self->priv->failed_link_count++; if (self->priv->failed_link_count <= 6) - link = default_link; + have_link = default_link; } - return link; + return have_link; } @@ -1352,7 +1352,7 @@ nm_device_802_11_wireless_set_frequency (NMDevice80211Wireless *self, g_return_if_fail (self != NULL); - if (nm_device_802_11_wireless_get_frequency (self) == freq) + if (fabs (nm_device_802_11_wireless_get_frequency (self) - freq) <= DBL_EPSILON) return; iface = nm_device_get_iface (NM_DEVICE (self)); diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index 5914a56c9..5a06c0d0b 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -61,29 +61,27 @@ nm_device_802_3_ethernet_init (NMDevice8023Ethernet * self) static gboolean probe_link (NMDevice8023Ethernet *self) { - gboolean link = FALSE; + gboolean have_link = FALSE; gchar * contents; gsize length; - guint32 caps; if (nm_device_get_removed (NM_DEVICE (self))) return FALSE; if (g_file_get_contents (self->priv->carrier_file_path, &contents, &length, NULL)) { - link = (gboolean) atoi (contents); + have_link = (gboolean) atoi (contents); g_free (contents); } /* We say that non-carrier-detect devices always have a link, because - * they never get auto-selected by NM. User has to force them on us, + * they never get auto-selected by NM. The user has to force them on us, * so we just hope the user knows whether or not the cable's plugged in. */ - caps = nm_device_get_capabilities (NM_DEVICE (self)); - if (!(caps & NM_DEVICE_CAP_CARRIER_DETECT)) - link = TRUE; + if (!have_link && !(nm_device_get_capabilities (NM_DEVICE (self)) & NM_DEVICE_CAP_CARRIER_DETECT)) + have_link = TRUE; - return link; + return have_link; } diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index de89a3bac..ef1c1768d 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -196,14 +196,14 @@ void nm_ip4_config_add_nameserver (NMIP4Config *config, guint32 nameserver) config->nameservers = g_slist_append (config->nameservers, GINT_TO_POINTER (nameserver)); } -guint32 nm_ip4_config_get_nameserver (NMIP4Config *config, guint index) +guint32 nm_ip4_config_get_nameserver (NMIP4Config *config, guint i) { guint nameserver; g_return_val_if_fail (config != NULL, 0); - g_return_val_if_fail (index < g_slist_length (config->nameservers), 0); + g_return_val_if_fail (i < g_slist_length (config->nameservers), 0); - if ((nameserver = GPOINTER_TO_UINT (g_slist_nth_data (config->nameservers, index)))) + if ((nameserver = GPOINTER_TO_UINT (g_slist_nth_data (config->nameservers, i)))) return nameserver; return 0; } @@ -222,14 +222,14 @@ void nm_ip4_config_add_nis_server (NMIP4Config *config, guint32 nis_server) config->nis_servers = g_slist_append (config->nis_servers, GINT_TO_POINTER (nis_server)); } -guint32 nm_ip4_config_get_nis_server (NMIP4Config *config, guint index) +guint32 nm_ip4_config_get_nis_server (NMIP4Config *config, guint i) { guint nis_server; g_return_val_if_fail (config != NULL, 0); - g_return_val_if_fail (index < g_slist_length (config->nis_servers), 0); + g_return_val_if_fail (i < g_slist_length (config->nis_servers), 0); - if ((nis_server = GPOINTER_TO_UINT (g_slist_nth_data (config->nis_servers, index)))) + if ((nis_server = GPOINTER_TO_UINT (g_slist_nth_data (config->nis_servers, i)))) return nis_server; return 0; } @@ -269,14 +269,14 @@ gchar *nm_ip4_config_get_nis_domain (NMIP4Config *config) return config->nis_domain; } -const char *nm_ip4_config_get_domain (NMIP4Config *config, guint index) +const char *nm_ip4_config_get_domain (NMIP4Config *config, guint i) { const char *domain; g_return_val_if_fail (config != NULL, NULL); - g_return_val_if_fail (index < g_slist_length (config->domains), NULL); + g_return_val_if_fail (i < g_slist_length (config->domains), NULL); - if ((domain = (const char *) g_slist_nth_data (config->domains, index))) + if ((domain = (const char *) g_slist_nth_data (config->domains, i))) return domain; return NULL; } diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 0751b3e63..b34b25160 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -212,9 +212,9 @@ void nm_vpn_manager_remove_connection (NMVPNManager *manager, NMVPNConnection *v if (manager->act_req && (nm_vpn_act_request_get_connection (manager->act_req) == vpn)) { NMVPNService * service = nm_vpn_act_request_get_service (manager->act_req); - NMVPNConnection * vpn = nm_vpn_act_request_get_connection (manager->act_req); + NMVPNConnection * v = nm_vpn_act_request_get_connection (manager->act_req); - nm_vpn_connection_deactivate (vpn); + nm_vpn_connection_deactivate (v); nm_vpn_service_stop_connection (service, manager->act_req); nm_vpn_act_request_unref (manager->act_req); diff --git a/test/nmtestdevices.c b/test/nmtestdevices.c index 976b949b3..086635aaf 100644 --- a/test/nmtestdevices.c +++ b/test/nmtestdevices.c @@ -81,7 +81,7 @@ static void create_device (DBusConnection *connection, NMDeviceType type) } -static void remove_device (DBusConnection *connection, char *dev) +static void destroy_device (DBusConnection *connection, char *dev) { DBusMessage *message; DBusMessage *reply; @@ -186,7 +186,7 @@ int main( int argc, char *argv[] ) DBusError error; char *dev = NULL; gboolean create = FALSE; - gboolean remove = FALSE; + gboolean destroy = FALSE; gboolean make_link_active = FALSE; gboolean make_link_inactive = FALSE; NMDeviceType dev_type = DEVICE_TYPE_UNKNOWN; @@ -238,7 +238,7 @@ int main( int argc, char *argv[] ) } else if (strcmp (opt, "remove-device") == 0) { - remove = TRUE; + destroy = TRUE; if (optarg) dev = g_strdup (optarg); } @@ -276,8 +276,8 @@ int main( int argc, char *argv[] ) if (create) create_device (connection, dev_type); - else if (remove) - remove_device (connection, dev); + else if (destroy) + destroy_device (connection, dev); else if (make_link_active) set_link_active (connection, dev, TRUE); else if (make_link_inactive)