diff options
| author | Kenneth Soerensen <knnthsrnsn@gmail.com> | 2018-03-29 19:51:37 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-03-30 07:28:34 +0000 |
| commit | afede5f8677cb4d580d81910c767cc5e6c58e442 (patch) | |
| tree | 33bd1ce6d5ec269b9afa4a84b5a2b1f250209fa2 /epan/dissectors/packet-zbee-zcl-se.c | |
| parent | 5efe9146d0027cd7c4828de023c4ec294b18f42d (diff) | |
ZigBee: Do not use value_string_ext for small arrays
Change-Id: If3544b57fac913e3c447910e35fc642651ac69e1
Reviewed-on: https://code.wireshark.org/review/26681
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-zbee-zcl-se.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-zcl-se.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-zbee-zcl-se.c b/epan/dissectors/packet-zbee-zcl-se.c index 00c0fdc8df..45cc8f0f8e 100644 --- a/epan/dissectors/packet-zbee-zcl-se.c +++ b/epan/dissectors/packet-zbee-zcl-se.c @@ -95,7 +95,6 @@ static void dissect_zcl_date(tvbuff_t *tvb, proto_tree *tree, guint *offset, VALUE_STRING_ENUM(zbee_zcl_keep_alive_attr_names); VALUE_STRING_ARRAY(zbee_zcl_keep_alive_attr_names); -static value_string_ext zbee_zcl_keep_alive_attr_names_ext = VALUE_STRING_EXT_INIT(zbee_zcl_keep_alive_attr_names); /*************************/ /* Function Declarations */ @@ -185,7 +184,7 @@ proto_register_zbee_zcl_keep_alive(void) static hf_register_info hf[] = { { &hf_zbee_zcl_keep_alive_attr_id, - { "Attribute", "zbee_zcl_se.keep_alive.attr_id", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &zbee_zcl_keep_alive_attr_names_ext, + { "Attribute", "zbee_zcl_se.keep_alive.attr_id", FT_UINT16, BASE_HEX, VALS(zbee_zcl_keep_alive_attr_names), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_keep_alive_attr_reporting_status, /* common to all SE clusters */ @@ -10571,7 +10570,6 @@ proto_reg_handoff_zbee_zcl_events(void) VALUE_STRING_ENUM(zbee_zcl_mdu_pairing_attr_names); VALUE_STRING_ARRAY(zbee_zcl_mdu_pairing_attr_names); -static value_string_ext zbee_zcl_mdu_pairing_attr_names_ext = VALUE_STRING_EXT_INIT(zbee_zcl_mdu_pairing_attr_names); /* Server Commands Received */ #define zbee_zcl_mdu_pairing_srv_rx_cmd_names_VALUE_STRING_LIST(XXX) \ @@ -10797,7 +10795,7 @@ proto_register_zbee_zcl_mdu_pairing(void) static hf_register_info hf[] = { { &hf_zbee_zcl_mdu_pairing_attr_id, - { "Attribute", "zbee_zcl_se.mdu_pairing.attr_id", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &zbee_zcl_mdu_pairing_attr_names_ext, + { "Attribute", "zbee_zcl_se.mdu_pairing.attr_id", FT_UINT16, BASE_HEX, VALS(zbee_zcl_mdu_pairing_attr_names), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_mdu_pairing_attr_reporting_status, /* common to all SE clusters */ @@ -10889,7 +10887,6 @@ proto_reg_handoff_zbee_zcl_mdu_pairing(void) VALUE_STRING_ENUM(zbee_zcl_sub_ghz_attr_names); VALUE_STRING_ARRAY(zbee_zcl_sub_ghz_attr_names); -static value_string_ext zbee_zcl_sub_ghz_attr_names_ext = VALUE_STRING_EXT_INIT(zbee_zcl_sub_ghz_attr_names); /* Server Commands Received */ #define zbee_zcl_sub_ghz_srv_rx_cmd_names_VALUE_STRING_LIST(XXX) \ @@ -11075,7 +11072,7 @@ proto_register_zbee_zcl_sub_ghz(void) static hf_register_info hf[] = { { &hf_zbee_zcl_sub_ghz_attr_id, - { "Attribute", "zbee_zcl_se.sub_ghz.attr_id", FT_UINT16, BASE_HEX | BASE_EXT_STRING, &zbee_zcl_sub_ghz_attr_names_ext, + { "Attribute", "zbee_zcl_se.sub_ghz.attr_id", FT_UINT16, BASE_HEX, VALS(zbee_zcl_sub_ghz_attr_names), 0x0, NULL, HFILL } }, { &hf_zbee_zcl_sub_ghz_attr_reporting_status, /* common to all SE clusters */ |