diff options
| author | pascal <pascal@localhost> | 2012-04-30 19:14:14 +0000 |
|---|---|---|
| committer | pascal <pascal@localhost> | 2012-04-30 19:14:14 +0000 |
| commit | 95eb2e7288d941c7c18d711da282e6a88ee0eda1 (patch) | |
| tree | c87733d3ae806f75c08bdd671d6b1c483baf5a3d /epan/dissectors/packet-6lowpan.c | |
| parent | 0f3c6a288e7d2577168a230a9c77ea2d81cb2701 (diff) | |
From Martin Kaiser:
Fix some 'intermediate pointers must be const qualified' warnings
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7215
svn path=/trunk/; revision=42355
Diffstat (limited to 'epan/dissectors/packet-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 22339bf2ae..c71a2070dd 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -418,7 +418,7 @@ static const guint8 lowpan_llprefix[8] = { #define LOWPAN_CONTEXT_DEFAULT 0 #define LOWPAN_CONTEXT_LINK_LOCAL LOWPAN_CONTEXT_COUNT /* An internal context used for the link-local prefix. */ static struct e_in6_addr lowpan_context_table[LOWPAN_CONTEXT_COUNT+1]; /* The 17-th context stores the link-local prefix. */ -static gchar * lowpan_context_prefs[LOWPAN_CONTEXT_COUNT]; /* Array of strings set by the preferences. */ +static const gchar * lowpan_context_prefs[LOWPAN_CONTEXT_COUNT]; /* Array of strings set by the preferences. */ /* Helper macro to convert a bit offset/length into a byte count. */ #define BITS_TO_BYTE_LEN(bitoff, bitlen) ((bitlen)?(((bitlen) + ((bitoff)&0x07) + 7) >> 3):(0)) @@ -2530,7 +2530,7 @@ proto_register_6lowpan(void) /* Initialize the context table. */ memset(lowpan_context_table, 0, sizeof(lowpan_context_table)); - memset(lowpan_context_prefs, 0, sizeof(lowpan_context_prefs)); + memset((gchar*)lowpan_context_prefs, 0, sizeof(lowpan_context_prefs)); /* Initialize the link-local prefix. */ lowpan_context_table[LOWPAN_CONTEXT_LINK_LOCAL].bytes[0] = 0xfe; @@ -2564,7 +2564,7 @@ proto_register_6lowpan(void) g_string_printf(pref_title, "Context %d", i); g_string_printf(pref_desc, "IPv6 prefix to use for stateful address decompression."); prefs_register_string_preference(prefs_module, pref_name->str, pref_title->str, - pref_desc->str, (const char **) &lowpan_context_prefs[i]); + pref_desc->str, &lowpan_context_prefs[i]); /* Don't free the ->str */ g_string_free(pref_name, FALSE); g_string_free(pref_title, FALSE); |