diff options
author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-05-13 17:13:03 +0000 |
---|---|---|
committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-05-13 17:13:03 +0000 |
commit | a2e759ec4dac598721a8fedd9847a2957af6bb37 (patch) | |
tree | a0f2128a3543adfab076f90aecb5b278d0747c45 /gtk/airpcap_dlg.c | |
parent | 44224f49abca20d587d88064fd3488adeadcfa32 (diff) |
Don't check if unsigned values are > 0.
Removed some unused variables and marked some unused arguments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28351 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/airpcap_dlg.c')
-rw-r--r-- | gtk/airpcap_dlg.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c index 8231f6e3c4..b0552d0995 100644 --- a/gtk/airpcap_dlg.c +++ b/gtk/airpcap_dlg.c @@ -181,7 +181,7 @@ on_key_ls_click_column(GtkWidget *widget _U_, * Callback for the crc checkbox */ static void -on_fcs_ck_toggled(GtkWidget *w, gpointer user_data) +on_fcs_ck_toggled(GtkWidget *w _U_, gpointer user_data _U_) { if (airpcap_if_selected != NULL) @@ -741,7 +741,7 @@ on_add_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) /* * XXX - Maybe we need some check on the characters? I'm not sure if only standard ASCII are ok... */ - if ( ((new_ssid_string->len) > WPA_SSID_MAX_CHAR_SIZE) || ((new_ssid_string->len) < WPA_SSID_MIN_CHAR_SIZE)) + if ((new_ssid_string->len) > WPA_SSID_MAX_CHAR_SIZE) { simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"SSID key size out of range!\nValid SSID size range is %d-%d ASCII characters (%d-%d bits).",WPA_SSID_MIN_CHAR_SIZE,WPA_SSID_MAX_CHAR_SIZE,WPA_SSID_MIN_BIT_SIZE,WPA_SSID_MAX_BIT_SIZE); @@ -949,7 +949,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) /* * XXX - Maybe we need some check on the characters? I'm not sure if only standard ASCII are ok... */ - if ( ((new_ssid_string->len) > WPA_SSID_MAX_CHAR_SIZE) || ((new_ssid_string->len) < WPA_SSID_MIN_CHAR_SIZE)) + if ((new_ssid_string->len) > WPA_SSID_MAX_CHAR_SIZE) { simple_dialog(ESD_TYPE_ERROR,ESD_BTN_OK,"SSID key size out of range!\nValid SSID size range is %d-%d ASCII characters (%d-%d bits).",WPA_SSID_MIN_CHAR_SIZE,WPA_SSID_MAX_CHAR_SIZE,WPA_SSID_MIN_BIT_SIZE,WPA_SSID_MAX_BIT_SIZE); @@ -1030,7 +1030,7 @@ on_edit_key_ok_bt_clicked(GtkWidget *widget _U_, gpointer data _U_) * Callback for the 'Add Key' button. */ void -on_add_new_key_bt_clicked(GtkWidget *button, gpointer data _U_) +on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data _U_) { GtkWidget *add_key_window; GtkWidget *add_frame; @@ -1598,7 +1598,7 @@ on_move_key_down_bt_clicked(GtkWidget *button _U_, gpointer data) /* Turns the decryption on or off */ void -on_decryption_mode_cb_changed(GtkWidget *cb, gpointer data) +on_decryption_mode_cb_changed(GtkWidget *cb, gpointer data _U_) { gint cur_active; @@ -2545,8 +2545,6 @@ on_key_management_ok_bt_clicked(GtkWidget *button, gpointer data) void on_key_management_cancel_bt_clicked(GtkWidget *button _U_, gpointer data) { - PAirpcapHandle ad = NULL; - /* Retrieve object data */ GtkWidget *key_management_w; GtkWidget *cancel_bt; |