aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2005-07-24 19:01:28 +0000
committerGuy Harris <guy@alum.mit.edu>2005-07-24 19:01:28 +0000
commit554f62000190dead7a2d16e272138cc6e24ee57f (patch)
treeca1693ebf1407ac544cb272dbfe175ff1ff44a39 /epan/dissectors/packet-ieee80211.c
parent72c01a62f828e6a19a46eaa25807114fc1cca840 (diff)
downloadwireshark-554f62000190dead7a2d16e272138cc6e24ee57f.tar.gz
wireshark-554f62000190dead7a2d16e272138cc6e24ee57f.tar.bz2
wireshark-554f62000190dead7a2d16e272138cc6e24ee57f.zip
Constify to remove a bunch of warnings. Add some casts to squelch
(presumably-)harmless-but-otherwise-unremovable const-to-nonconst warnings. In the TACACS dissector, clean up the variables used in option parsing to avoid some const-to-nonconst warnings. Clean up some white space. svn path=/trunk/; revision=15043
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 2dd6686e7a..9bd4d07d7d 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -110,7 +110,7 @@ static int weak_iv(guchar *iv);
*/
#ifndef USE_ENV
-static char *wep_keystr[] = {NULL, NULL, NULL, NULL};
+static const char *wep_keystr[] = {NULL, NULL, NULL, NULL};
#endif
/* ************************************************************************* */
@@ -3589,7 +3589,7 @@ static int wep_decrypt(guint8 *buf, guint32 len, int key_override) {
}
static void init_wepkeys(void) {
- char *tmp;
+ const char *tmp;
int i;
GByteArray *bytes;
gboolean res;