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-ber.c | 2 +- epan/dissectors/packet-bgp.c | 2 +- epan/dissectors/packet-bootp.c | 2 +- epan/dissectors/packet-btrfcomm.c | 2 +- epan/dissectors/packet-c1222.c | 2 +- epan/dissectors/packet-collectd.c | 2 +- epan/dissectors/packet-devicenet.c | 2 +- epan/dissectors/packet-dmp.c | 2 +- epan/dissectors/packet-dtls.c | 2 +- epan/dissectors/packet-ess.c | 2 +- epan/dissectors/packet-etsi_card_app_toolkit.c | 2 +- epan/dissectors/packet-http.c | 2 +- epan/dissectors/packet-ieee80211.c | 2 +- epan/dissectors/packet-ieee802154.c | 2 +- epan/dissectors/packet-imf.c | 2 +- epan/dissectors/packet-ipsec.c | 2 +- epan/dissectors/packet-isakmp.c | 4 ++-- epan/dissectors/packet-k12.c | 2 +- epan/dissectors/packet-ldap.c | 2 +- epan/dissectors/packet-mac-lte.c | 2 +- epan/dissectors/packet-mq.c | 4 ++-- epan/dissectors/packet-pdcp-lte.c | 2 +- epan/dissectors/packet-pres.c | 2 +- epan/dissectors/packet-reload.c | 2 +- epan/dissectors/packet-sccp.c | 2 +- epan/dissectors/packet-sctp.c | 2 +- epan/dissectors/packet-snmp.c | 2 +- epan/dissectors/packet-ssl.c | 2 +- epan/dissectors/packet-time.c | 8 +++++++- epan/dissectors/packet-ua3g.c | 6 +++--- epan/dissectors/packet-user_encap.c | 2 +- epan/dissectors/packet-vcdu.c | 2 +- epan/dissectors/packet-zbee-nwk-gp.c | 2 +- epan/dissectors/packet-zbee-security.c | 2 +- 34 files changed, 44 insertions(+), 38 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 6293bf9105..d7375f0418 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -5411,7 +5411,7 @@ proto_register_ber(void) sizeof(oid_user_t), "oid", FALSE, - (void**) &oid_users, + &oid_users, &num_oid_users, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChObjectIdentifiers", diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 64d4c4d631..f9a8ea54e9 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -6620,7 +6620,7 @@ proto_register_bgp(void) BASE_DEC, VALS(link_state_nlri_protocol_id_values), 0x0, NULL, HFILL }}, { &hf_bgp_ls_nlri_node_identifier, { "Identifier", "bgp.ls.nlri_node.identifier", FT_UINT64, - BASE_DEC | BASE_VAL64_STRING, VALS(link_state_nlri_routing_universe_values), 0x0, NULL, HFILL }}, + BASE_DEC | BASE_VAL64_STRING, VALS64(link_state_nlri_routing_universe_values), 0x0, NULL, HFILL }}, { &hf_bgp_ls_ipv4_topology_prefix_nlri_type, { "Link-State NLRI IPv4 Topology Prefix", "bgp.ls.ipv4_topology_prefix", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}}, diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 8648b877d9..078264d8ee 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -6984,7 +6984,7 @@ proto_register_bootp(void) sizeof(uat_bootp_record_t), /* record size */ "custom_bootp", /* filename */ TRUE, /* from_profile */ - (void**) &uat_bootp_records,/* data_ptr */ + &uat_bootp_records, /* data_ptr */ &num_bootp_records_uat, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 894b6aa83c..4689080794 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -1084,7 +1084,7 @@ proto_register_btrfcomm(void) sizeof(uat_rfcomm_channels_t), "rfcomm_channels", TRUE, - (void**) &rfcomm_channels, + &rfcomm_channels, &num_rfcomm_channels, UAT_AFFECTS_DISSECTION, NULL, diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 606cef559e..d3c503666f 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -2037,7 +2037,7 @@ void proto_register_c1222(void) { sizeof(c1222_uat_data_t), /* record size */ "c1222_decryption_table", /* filename */ TRUE, /* from_profile */ - (void**)&c1222_uat_data, /* data_ptr */ + &c1222_uat_data, /* data_ptr */ &num_c1222_uat_data, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ diff --git a/epan/dissectors/packet-collectd.c b/epan/dissectors/packet-collectd.c index 42711aa07e..5deb11359d 100644 --- a/epan/dissectors/packet-collectd.c +++ b/epan/dissectors/packet-collectd.c @@ -1460,7 +1460,7 @@ void proto_register_collectd(void) }, { &hf_collectd_data_severity, { "Severity", "collectd.data.severity", FT_UINT64, BASE_HEX | BASE_VAL64_STRING, - VALS(severity_names), + VALS64(severity_names), 0x0, NULL, HFILL } }, { &hf_collectd_data_message, 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 */ diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index ea716f8378..2dd6e33f4a 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -4916,7 +4916,7 @@ void proto_register_dmp (void) sizeof(dmp_security_class_t), "dmp_security_classifications", TRUE, - (void**) &dmp_security_classes, + &dmp_security_classes, &num_dmp_security_classes, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChDMPSecurityClassifications", diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index 9d4acb6140..8d89f4cfe2 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -3329,7 +3329,7 @@ proto_register_dtls(void) sizeof(ssldecrypt_assoc_t), "dtlsdecrypttablefile", /* filename */ TRUE, /* from_profile */ - (void**) &dtlskeylist_uats, /* data_ptr */ + &dtlskeylist_uats, /* data_ptr */ &ndtlsdecrypt, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChK12ProtocolsSection", /* TODO, need revision - help */ diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index 26ac25e812..931fb728d6 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -1482,7 +1482,7 @@ void proto_register_ess(void) { sizeof(ess_category_attributes_t), "ess_category_attributes", TRUE, - (void**) &ess_category_attributes, + &ess_category_attributes, &num_ess_category_attributes, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChEssCategoryAttributes", diff --git a/epan/dissectors/packet-etsi_card_app_toolkit.c b/epan/dissectors/packet-etsi_card_app_toolkit.c index 1e4969dcdf..57a9cb9924 100644 --- a/epan/dissectors/packet-etsi_card_app_toolkit.c +++ b/epan/dissectors/packet-etsi_card_app_toolkit.c @@ -1522,7 +1522,7 @@ proto_register_card_app_toolkit(void) }, { &hf_ctlv_aid_rid, { "RID", "etsi_cat.comp_tlv.aid.rid", - FT_UINT64, BASE_HEX|BASE_VAL64_STRING, VALS(aid_rid_vals), 0, + FT_UINT64, BASE_HEX|BASE_VAL64_STRING, VALS64(aid_rid_vals), 0, NULL, HFILL }, }, { &hf_ctlv_aid_pix_app_code_etsi, diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index f24d810278..eea72aa04a 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -3087,7 +3087,7 @@ proto_register_http(void) sizeof(header_field_t), "custom_http_header_fields", TRUE, - (void**) &header_fields, + &header_fields, &num_header_fields, /* specifies named fields, so affects dissection and the set of named fields */ diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 3b2ce7c9a4..d414ba8167 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -22012,7 +22012,7 @@ proto_register_ieee80211 (void) sizeof(uat_wep_key_record_t), /* record size */ "80211_keys", /* filename */ TRUE, /* from_profile */ - (void**) &uat_wep_key_records,/* data_ptr */ + &uat_wep_key_records, /* data_ptr */ &num_wepkeys_uat, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 385861ebb2..955e9167f4 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -2732,7 +2732,7 @@ void proto_register_ieee802154(void) sizeof(static_addr_t), /* record size */ "802154_addresses", /* filename */ TRUE, /* from_profile */ - (void**)&static_addrs, /* data_ptr */ + &static_addrs, /* data_ptr */ &num_static_addrs, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c index fb6fe4c63e..772086bca2 100644 --- a/epan/dissectors/packet-imf.c +++ b/epan/dissectors/packet-imf.c @@ -1230,7 +1230,7 @@ proto_register_imf(void) sizeof(header_field_t), "imf_header_fields", TRUE, - (void**) &header_fields, + &header_fields, &num_header_fields, /* specifies named fields, so affects dissection and the set of named fields */ diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 40be4247f0..ef72c46c27 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -2216,7 +2216,7 @@ proto_register_ipsec(void) sizeof(uat_esp_sa_record_t), /* record size */ "esp_sa", /* filename */ TRUE, /* from_profile */ - (void**) &uat_esp_sa_records, /* data_ptr */ + &uat_esp_sa_records, /* data_ptr */ &num_sa_uat, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index b668f6da10..7366b75831 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -6178,7 +6178,7 @@ proto_register_isakmp(void) sizeof(ikev1_uat_data_key_t), "ikev1_decryption_table", TRUE, - (void**)&ikev1_uat_data, + &ikev1_uat_data, &num_ikev1_uat_data, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChIKEv1DecryptionSection", @@ -6198,7 +6198,7 @@ proto_register_isakmp(void) sizeof(ikev2_uat_data_t), "ikev2_decryption_table", TRUE, - (void**)&ikev2_uat_data, + &ikev2_uat_data, &num_ikev2_uat_data, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChIKEv2DecryptionSection", diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 85fb437412..4e76c18bde 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -466,7 +466,7 @@ proto_register_k12(void) sizeof(k12_handles_t), "k12_protos", /* filename */ TRUE, /* from_profile */ - (void**) &k12_handles, /* data_ptr */ + &k12_handles, /* data_ptr */ &nk12_handles, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChK12ProtocolsSection", /* help */ diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 99bdfb9020..caa323ecb0 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -5863,7 +5863,7 @@ void proto_register_ldap(void) { sizeof(attribute_type_t), "custom_ldap_attribute_types", TRUE, - (void**) &attribute_types, + &attribute_types, &num_attribute_types, /* specifies named fields, so affects dissection and the set of named fields */ diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c index 09308f8f61..e18ed94447 100644 --- a/epan/dissectors/packet-mac-lte.c +++ b/epan/dissectors/packet-mac-lte.c @@ -6896,7 +6896,7 @@ void proto_register_mac_lte(void) sizeof(lcid_drb_mapping_t), "drb_logchans", TRUE, - (void**) &lcid_drb_mappings, + &lcid_drb_mappings, &num_lcid_drb_mappings, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "", /* TODO: is this ref to help manual? */ diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index c06d1cfb63..0b4861ec65 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -2271,7 +2271,7 @@ static gint dissect_mq_sid(tvbuff_t *tvb, proto_tree *tree, mq_parm_t *p_mq_parm { guint8 iSIDL; guint8 iSID; - guint8 *sid_str; + char *sid_str; gint bOffset = offset; iSIDL = tvb_get_guint8(tvb, offset); @@ -2284,7 +2284,7 @@ static gint dissect_mq_sid(tvbuff_t *tvb, proto_tree *tree, mq_parm_t *p_mq_parm offset++; if (iSID == MQ_MQSIDT_NT_SECURITY_ID) { - offset = dissect_nt_sid(tvb, offset, tree, "SID", (char **)&sid_str, -1); + offset = dissect_nt_sid(tvb, offset, tree, "SID", &sid_str, -1); } else { diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c index e8317566ec..2f6f42a34c 100644 --- a/epan/dissectors/packet-pdcp-lte.c +++ b/epan/dissectors/packet-pdcp-lte.c @@ -2562,7 +2562,7 @@ void proto_register_pdcp(void) sizeof(uat_ue_keys_record_t), /* record size */ "pdcp_lte_ue_keys", /* filename */ TRUE, /* from_profile */ - (void**) &uat_ue_keys_records, /* data_ptr */ + &uat_ue_keys_records, /* data_ptr */ &num_ue_keys_uat, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* help */ diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index eb057ad636..7fd97942fa 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1910,7 +1910,7 @@ void proto_register_pres(void) { sizeof(pres_user_t), "pres_context_list", TRUE, - (void**) &pres_users, + &pres_users, &num_pres_users, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChPresContextList", diff --git a/epan/dissectors/packet-reload.c b/epan/dissectors/packet-reload.c index 026953f88a..af74237bb6 100644 --- a/epan/dissectors/packet-reload.c +++ b/epan/dissectors/packet-reload.c @@ -5907,7 +5907,7 @@ proto_register_reload(void) sizeof(kind_t), "reload_kindids", /* filename */ TRUE, /* from_profile */ - (void**) &kindidlist_uats, /* data_ptr */ + &kindidlist_uats, /* data_ptr */ &nreloadkinds, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* Help section (currently a wiki page) */ diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 9aa87d96d8..37b186ba1f 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -4069,7 +4069,7 @@ proto_register_sccp(void) uat_t *users_uat = uat_new("SCCP Users Table", sizeof(sccp_user_t), - "sccp_users", TRUE, (void**) &sccp_users, + "sccp_users", TRUE, &sccp_users, &num_sccp_users, UAT_AFFECTS_DISSECTION, "ChSccpUsers", sccp_users_copy_cb, sccp_users_update_cb, sccp_users_free_cb, diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 50cdebf96d..1d8253cb31 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -4692,7 +4692,7 @@ proto_register_sctp(void) sizeof(type_field_t), "statistics_chunk_types", TRUE, - (void**) &type_fields, + &type_fields, &num_type_fields, 0, NULL, diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index 72a799258a..10a1e57d89 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3999,7 +3999,7 @@ void proto_register_snmp(void) { sizeof(snmp_ue_assoc_t), "snmp_users", TRUE, - (void**)&ueas, + &ueas, &num_ueas, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChSNMPUsersSection", diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 64bfb5fba1..07cbd6e2ab 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -5501,7 +5501,7 @@ proto_register_ssl(void) sizeof(ssldecrypt_assoc_t), "ssl_keys", /* filename */ TRUE, /* from_profile */ - (void**) &sslkeylist_uats, /* data_ptr */ + &sslkeylist_uats, /* data_ptr */ &nssldecrypt, /* numitems_ptr */ UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* Help section (currently a wiki page) */ diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c index 68cd241622..373ed50cd7 100644 --- a/epan/dissectors/packet-time.c +++ b/epan/dissectors/packet-time.c @@ -45,7 +45,13 @@ static int proto_time = -1; static int hf_time_time = -1; static gint ett_time = -1; -static absolute_time_display_e time_display_type = ABSOLUTE_TIME_LOCAL; +/* Instead of using absolute_time_display_e as the type for + * time_display_type, we use gint to avoid a type-punning problem + * with prefs_register_enum_preference(). This variable is also + * used with abs_time_secs_to_ep_str(), which _does_ take + * an absolute_time_display_e, but gcc doesn't complain about + * casting the gint to absolute_time_display_e */ +static gint time_display_type = ABSOLUTE_TIME_LOCAL; /* This dissector works for TCP and UDP time packets */ #define TIME_PORT 37 diff --git a/epan/dissectors/packet-ua3g.c b/epan/dissectors/packet-ua3g.c index 9ebd5b5718..2e77d37a5a 100644 --- a/epan/dissectors/packet-ua3g.c +++ b/epan/dissectors/packet-ua3g.c @@ -4405,7 +4405,7 @@ proto_register_ua3g(void) { &hf_ua3g_ip_device_routing_reset_parameter_l10n_name, { "L10N_Name", "ua3g.ip.reset.parameter.l10n_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ip_device_routing_start_rtp_parameter_value, { "Value", "ua3g.ip.start_rtp.parameter.value", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ip_device_routing_start_rtp_parameter_ip, { "IP", "ua3g.ip.start_rtp.parameter.ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - { &hf_ua3g_ip_device_routing_start_rtp_parameter_compressor, { "Compressor", "ua3g.ip.start_rtp.parameter.compressor", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS(str_start_rtp_compressor), 0x0, NULL, HFILL }}, + { &hf_ua3g_ip_device_routing_start_rtp_parameter_compressor, { "Compressor", "ua3g.ip.start_rtp.parameter.compressor", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(str_start_rtp_compressor), 0x0, NULL, HFILL }}, { &hf_ua3g_ip_device_routing_start_rtp_parameter_enabler, { "Enabler", "ua3g.ip.start_rtp.parameter.enabler", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ip_device_routing_start_rtp_parameter_send_qos, { "Must Send QOS Tickets", "ua3g.ip.start_rtp.parameter.enabler", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_ip_device_routing_start_rtp_parameter_uint, { "Value", "ua3g.ip.start_rtp.parameter.uint", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }}, @@ -4508,10 +4508,10 @@ proto_register_ua3g(void) { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_string, { "IP", "ua3g.ip.cs.cmd03.parameter.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip1, { "Type Of Equipment (first byte)", "ua3g.ip.cs.cmd03.parameter.type_of_equip1", FT_UINT8, BASE_DEC, VALS(cs_ip_device_routing_cmd03_first_byte_vals), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_type_of_equip2, { "Type Of Equipment (second byte)", "ua3g.ip.cs.cmd03.parameter.type_of_equip2", FT_UINT16, BASE_DEC, VALS(cs_ip_device_routing_cmd03_second_byte_vals), 0x0, NULL, HFILL }}, - { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_default_codec, { "Default Codec", "ua3g.ip.cs.cmd03.parameter.default_codec", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS(str_cs_ip_device_routing_0F_compressor), 0x0, NULL, HFILL }}, + { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_default_codec, { "Default Codec", "ua3g.ip.cs.cmd03.parameter.default_codec", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(str_cs_ip_device_routing_0F_compressor), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_vad, { "VAD", "ua3g.ip.cs.cmd03.parameter.vad", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_ece, { "ECE", "ua3g.ip.cs.cmd03.parameter.ece", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x0, NULL, HFILL }}, - { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_voice_mode, { "Voice Mode", "ua3g.ip.cs.cmd03.parameter.voice_mode", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS(cs_ip_device_routing_cmd03_voice_mode_vals), 0x0, NULL, HFILL }}, + { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_voice_mode, { "Voice Mode", "ua3g.ip.cs.cmd03.parameter.voice_mode", FT_UINT64, BASE_DEC|BASE_VAL64_STRING, VALS64(cs_ip_device_routing_cmd03_voice_mode_vals), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_delay_distribution, { "Delay Distribution", "ua3g.ip.cs.cmd03.parameter.delay_distribution", FT_UINT16, BASE_DEC, VALS(cs_ip_device_routing_delay_distribution_range_vals), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_consecutive_bfi, { "Consecutive BFI", "ua3g.ip.cs.cmd03.parameter.consecutive_bfi", FT_UINT16, BASE_DEC, VALS(cs_ip_device_routing_consecutive_bfi_range_vals), 0x0, NULL, HFILL }}, { &hf_ua3g_cs_ip_device_routing_cmd03_parameter_bfi_distribution, { "BFI Distribution", "ua3g.ip.cs.cmd03.parameter.bfi_distribution", FT_UINT16, BASE_DEC, VALS(cs_ip_device_routing_bfi_distribution_range_vals), 0x0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c index 1fa9b0cf57..42df092907 100644 --- a/epan/dissectors/packet-user_encap.c +++ b/epan/dissectors/packet-user_encap.c @@ -234,7 +234,7 @@ void proto_register_user_encap(void) sizeof(user_encap_t), "user_dlts", TRUE, - (void**) &encaps, + &encaps, &num_encaps, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ "ChUserDLTsSection", diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index f57fa70747..17f69890ba 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -621,7 +621,7 @@ proto_register_vcdu(void) sizeof(uat_channel_t), "vcdu_bitstream_channels", TRUE, - (void**)&uat_bitchannels, + &uat_bitchannels, &num_channels_uat, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, diff --git a/epan/dissectors/packet-zbee-nwk-gp.c b/epan/dissectors/packet-zbee-nwk-gp.c index 8881b9c029..7724e9313b 100644 --- a/epan/dissectors/packet-zbee-nwk-gp.c +++ b/epan/dissectors/packet-zbee-nwk-gp.c @@ -1784,7 +1784,7 @@ proto_register_zbee_nwk_gp(void) } zbee_gp_sec_key_table_uat = uat_new("ZigBee GP Security Keys", sizeof(uat_key_record_t), "zigbee_gp_keys", TRUE, - (void **)&gp_uat_key_records, &num_uat_key_records, UAT_AFFECTS_DISSECTION, NULL, uat_key_record_copy_cb, + &gp_uat_key_records, &num_uat_key_records, UAT_AFFECTS_DISSECTION, NULL, uat_key_record_copy_cb, uat_key_record_update_cb, uat_key_record_free_cb, NULL, key_uat_fields); prefs_register_uat_preference(gp_zbee_prefs, "gp_key_table", "Pre-configured GP Security Keys", diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 2e90f9c6e1..72e848fdac 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -278,7 +278,7 @@ void zbee_security_register(module_t *zbee_prefs, int proto) sizeof(uat_key_record_t), "zigbee_pc_keys", TRUE, - (void**) &uat_key_records, + &uat_key_records, &num_uat_key_records, UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */ NULL, /* TODO: ptr to help manual? */ -- cgit v1.2.3