From 4cc694839d45d767f4880988da3b88389774b5db Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Thu, 30 Jan 2014 09:43:52 -0800 Subject: Fix all -fstrict-alias warnings found by gcc 4.1.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Stig Bjørlykke Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte --- epan/dissectors/packet-devicenet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'epan/dissectors/packet-devicenet.c') diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index ed659fec64..250ad24c42 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -1021,7 +1021,7 @@ void proto_register_devicenet(void) sizeof(uat_devicenet_record_t), /* record size */ "devicenet_bodytypes", /* filename */ TRUE, /* from_profile */ - (void**) &uat_devicenet_records,/* data_ptr */ + &uat_devicenet_records, /* data_ptr */ &num_devicenet_records_uat, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ -- cgit v1.2.3