diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-02-19 21:45:27 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-02-19 21:45:27 +0000 |
| commit | 547a03b25bc410340844b05a56e9ee3cd631b6f8 (patch) | |
| tree | 7b56aa2fb23fc0c492289327be5afebb24bb2370 | |
| parent | 4009deca1bc56e1a26826e144e472367559bb637 (diff) | |
Fix some C++ style comments
svn path=/trunk/; revision=20865
| -rw-r--r-- | airpcap_loader.c | 4 | ||||
| -rw-r--r-- | epan/crypt/airpdcap_ccmp.c | 2 | ||||
| -rw-r--r-- | gtk/airpcap_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/main.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/airpcap_loader.c b/airpcap_loader.c index 91e23bc578..1e37cb6c18 100644 --- a/airpcap_loader.c +++ b/airpcap_loader.c @@ -1957,8 +1957,8 @@ keys_are_equals(decryption_key_t *k1,decryption_key_t *k2) return FALSE; /* XXX - Remove this check when we will have the WPA/WPA2 decryption in the Driver! */ - //if( (k1->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k1->type == AIRPDCAP_KEY_TYPE_WPA_PMK) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PMK) ) - // return TRUE; + /** //if( (k1->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PWD) || (k1->type == AIRPDCAP_KEY_TYPE_WPA_PMK) || (k2->type == AIRPDCAP_KEY_TYPE_WPA_PMK) ) **/ + /** // return TRUE; **/ if( g_string_equal(k1->key,k2->key) && (k1->bits == k2->bits) && /* If the previous is TRUE, this must be TRUE as well */ diff --git a/epan/crypt/airpdcap_ccmp.c b/epan/crypt/airpdcap_ccmp.c index c608b3e88f..742b8185c0 100644 --- a/epan/crypt/airpdcap_ccmp.c +++ b/epan/crypt/airpdcap_ccmp.c @@ -211,7 +211,7 @@ static void ccmp_init_blocks( b0[14] = b0[15] = 0; rijndael_encrypt(ctx, b0, b); - //XOR( m + len - 8, b, 8 ); + /** //XOR( m + len - 8, b, 8 ); **/ #undef IS_QOS_DATA #undef IS_4ADDRESS } diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c index 7724abf7e0..ab92fa39fc 100644 --- a/gtk/airpcap_dlg.c +++ b/gtk/airpcap_dlg.c @@ -834,7 +834,7 @@ on_key_management_apply_bt_clicked(GtkWidget *button, gpointer data _U_) update_decryption_mode_cm(toolbar_cm); /* Redissect all the packets, and re-evaluate the display filter. */ -//cf_redissect_packets(&cfile); +/** //cf_redissect_packets(&cfile); **/ } /* * Callback for the Wireless Advanced Settings 'Apply' button. @@ -3096,7 +3096,7 @@ on_key_management_ok_bt_clicked(GtkWidget *button, gpointer data _U_) update_decryption_mode_cm(toolbar_cm); /* Redissect all the packets, and re-evaluate the display filter. */ -//cf_redissect_packets(&cfile); +/** cf_redissect_packets(&cfile); **/ /* Save the preferences to preferences file!!! */ write_prefs_to_file(); diff --git a/gtk/main.c b/gtk/main.c index 39951a23ef..9513710aec 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -4557,7 +4557,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) if(airpcap_if_list == NULL) { /*No airpcap device found */ airpcap_enable_toolbar_widgets(airpcap_tb,FALSE); - //recent.airpcap_toolbar_show = TRUE; + /** //recent.airpcap_toolbar_show = TRUE; **/ } else { /* default adapter is not airpcap... or is airpcap but is not found*/ airpcap_set_toolbar_stop_capture(airpcap_if_active); |