From c38de722d080b6795643561efd14584b26a243bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Wed, 13 May 2009 10:13:33 +0000 Subject: [PATCH] Fixed some compiler warnings on OSX. Removed some unused variables. svn path=/trunk/; revision=28347 --- gtk/airpcap_gui_utils.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gtk/airpcap_gui_utils.c b/gtk/airpcap_gui_utils.c index 2b2d122d02..033d47270e 100644 --- a/gtk/airpcap_gui_utils.c +++ b/gtk/airpcap_gui_utils.c @@ -680,12 +680,12 @@ airpcap_update_channel_offset_cb(airpcap_if_info_t* if_info, ULONG ch_freq, GtkW } change_airpcap_settings = FALSE; - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(channel_offset_cb)->entry), new_offset_str); + gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(channel_offset_cb)->entry), new_offset_str); change_airpcap_settings = TRUE; - sscanf(new_offset_str,"%d",&(if_info->channelInfo.ExtChannel)); + sscanf(new_offset_str,"%c",&(if_info->channelInfo.ExtChannel)); if (!airpcap_update_frequency_and_offset(if_info)){ - simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Adapter failed to be set with the following settings: Frequency - %ld Extension Channel - %d", if_info->channelInfo.Frequency, if_info->channelInfo.ExtChannel); + simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"Adapter failed to be set with the following settings: Frequency - %d Extension Channel - %d", if_info->channelInfo.Frequency, if_info->channelInfo.ExtChannel); } } @@ -770,19 +770,17 @@ airpcap_load_channel_offset_cb(airpcap_if_info_t* if_info, GtkWidget* channel_of } } - return NULL; + return 0; } /* * Takes the keys from the GtkList widget, and add them to the interface list */ void -airpcap_add_keys_from_list(GtkWidget *key_ls, airpcap_if_info_t *if_info) +airpcap_add_keys_from_list(GtkWidget *key_ls, airpcap_if_info_t *if_info _U_) { GString *new_key; - gchar *text_entered = NULL; - /* airpcap stuff */ UINT i, j; gchar s[3]; @@ -877,8 +875,6 @@ airpcap_add_keys_to_driver_from_list(GtkWidget *key_ls,airpcap_if_info_t *fake_i { GString *new_key; - gchar *text_entered = NULL; - /* airpcap stuff */ UINT i, j; gchar s[3];