aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_a_common.h
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2016-02-09 22:55:37 +0100
committerAnders Broman <a.broman58@gmail.com>2016-02-10 05:06:28 +0000
commit3e448549fceb28b9efa202ef5cbb43c2ba426841 (patch)
tree6c6cc69177a0450821e17a95db451ea82f0199b2 /epan/dissectors/packet-gsm_a_common.h
parentf00a5003cbe588d098702c1361878bd297e0a465 (diff)
Squelch array compared to NULL coverity events.
Using code annotation to squelch detection by Coverity of use of macro parameter comparison to NULL, which we use to allow for leaving out strings if we don't have them. In this particular case it's happening in macro expansion. Change-Id: I5782c5891cab99860a9bae9519cf259359a09712 Reviewed-on: https://code.wireshark.org/review/13858 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gsm_a_common.h')
-rw-r--r--epan/dissectors/packet-gsm_a_common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h
index b2f6ab1853..dfeeb0b751 100644
--- a/epan/dissectors/packet-gsm_a_common.h
+++ b/epan/dissectors/packet-gsm_a_common.h
@@ -400,6 +400,7 @@ WS_DLL_PUBLIC guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info
"Missing Mandatory element (0x%02x) %s%s, rest of dissection is suspect", \
EMT_iei, \
get_gsm_a_msg_string(EMT_pdu_type, EMT_elem_idx), \
+ /* coverity[array_null] */ \
(EMT_elem_name_addition == NULL) ? "" : EMT_elem_name_addition \
); \
} \
@@ -425,6 +426,7 @@ WS_DLL_PUBLIC guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info
"Missing Mandatory element (0x%02x) %s%s, rest of dissection is suspect", \
EMT_iei, \
get_gsm_a_msg_string(EMT_pdu_type, EMT_elem_idx), \
+ /* coverity[array_null] */ \
(EMT_elem_name_addition == NULL) ? "" : EMT_elem_name_addition \
); \
} \
@@ -445,6 +447,7 @@ WS_DLL_PUBLIC guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info
"Missing Mandatory element (0x%02x) %s%s, rest of dissection is suspect", \
EMT_iei, \
get_gsm_a_msg_string(EMT_pdu_type, EMT_elem_idx), \
+ /* coverity[array_null] */ \
(EMT_elem_name_addition == NULL) ? "" : EMT_elem_name_addition \
); \
} \
@@ -494,6 +497,7 @@ WS_DLL_PUBLIC guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info
"Missing Mandatory element (0x%02x) %s%s, rest of dissection is suspect", \
EMT_iei, \
get_gsm_a_msg_string(EMT_pdu_type, EMT_elem_idx), \
+ /* coverity[array_null] */ \
(EMT_elem_name_addition == NULL) ? "" : EMT_elem_name_addition \
); \
} \