Fixed some compiler warnings on OSX.
Removed some unused variables. svn path=/trunk/; revision=28347
This commit is contained in:
parent
afa8408b1c
commit
c38de722d0
|
@ -680,12 +680,12 @@ airpcap_update_channel_offset_cb(airpcap_if_info_t* if_info, ULONG ch_freq, GtkW
|
||||||
}
|
}
|
||||||
|
|
||||||
change_airpcap_settings = FALSE;
|
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;
|
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)){
|
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
|
* Takes the keys from the GtkList widget, and add them to the interface list
|
||||||
*/
|
*/
|
||||||
void
|
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;
|
GString *new_key;
|
||||||
|
|
||||||
gchar *text_entered = NULL;
|
|
||||||
|
|
||||||
/* airpcap stuff */
|
/* airpcap stuff */
|
||||||
UINT i, j;
|
UINT i, j;
|
||||||
gchar s[3];
|
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;
|
GString *new_key;
|
||||||
|
|
||||||
gchar *text_entered = NULL;
|
|
||||||
|
|
||||||
/* airpcap stuff */
|
/* airpcap stuff */
|
||||||
UINT i, j;
|
UINT i, j;
|
||||||
gchar s[3];
|
gchar s[3];
|
||||||
|
|
Loading…
Reference in New Issue