summaryrefslogtreecommitdiff
path: root/epan/to_str.h
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2014-01-30 09:43:52 -0800
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-02-03 09:26:10 +0000
commit4cc694839d45d767f4880988da3b88389774b5db (patch)
tree40905d9cf9345c56314cdfdfd04a65c6e25764df /epan/to_str.h
parent479d27c69e46add652acbdd321fd3f88cfb50900 (diff)
downloadwireshark-4cc694839d45d767f4880988da3b88389774b5db.tar.gz
Fix all -fstrict-alias warnings found by gcc 4.1.2
The majority of the fixes are for calls to uat_new(). Instead of having each caller cast its private data to (void**), we use void* in the uat_new() API itself. Inside uat_new(), we cast the void* to void**. Some dissectors use val64_string arrays, so a VALS64() macro was added for those, to avoid using VALS(), which is useful only for value_string arrays. packet-mq.c was changed because dissect_nt_sid() requires a char**, not a guint**. All other callers of dissect_nt_sid() use char*'s (and take the address of it) for their local storage. So, this was changed to follow the other practices. A confusion between gint and absolute_time_display_e in packet-time.c was cleared up. The ugliest fix is the addition of ip6_guint8_to_str(), for exactly one caller. The caller uses one type of ip6 address byte array, while ip6_to_str() expects another. This new function is in place until the various address implementations can be consolidated. Add VALS64() to the developer documentation. Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805 Reviewed-on: https://code.wireshark.org/review/48 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/to_str.h')
-rw-r--r--epan/to_str.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/to_str.h b/epan/to_str.h
index 19e3a552a2..ebc6f8d654 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -67,6 +67,8 @@ extern gchar* fcwwn_to_str (const guint8 *);
WS_DLL_PUBLIC const gchar* tvb_fc_to_str(tvbuff_t *tvb, const gint offset);
WS_DLL_PUBLIC gchar* tvb_fcwwn_to_str (tvbuff_t *tvb, const gint offset);
WS_DLL_PUBLIC const gchar* ip6_to_str(const struct e_in6_addr *);
+WS_DLL_PUBLIC const gchar* ip6_guint8_to_str(const guint8 *ad);
+
WS_DLL_PUBLIC const gchar* tvb_ip6_to_str(tvbuff_t *tvb, const gint offset);
void ip6_to_str_buf(const struct e_in6_addr *, gchar *);
extern gchar* ipx_addr_to_str(const guint32, const guint8 *);