diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-05-01 11:36:14 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-05-01 09:38:29 +0000 |
| commit | 0d7087cc4ca0f3cccb39672ea014117e8b9e1f40 (patch) | |
| tree | fd6798af2465e13a875a49dc03678ef214a34ed2 /epan/dissectors/packet-cosnaming.c | |
| parent | 3ca9318d8215738b8d4edcde0598226cfc6cf031 (diff) | |
Revert "Fix the need to manually adjust packet-gias.c"
This reverts commit 3ca9318d8215738b8d4edcde0598226cfc6cf031.
Mac OS X buildbot are not happy
packet-gias.c:356: warning: 'hf_UCO_InvalidInputParameter_details' defined but not used
packet-gias.c:359: warning: 'hf_UCO_ProcessingFault_details' defined but not used
packet-gias.c:360: warning: 'hf_UCO_SystemFault_details' defined but not used
packet-gias.c:5275: warning: 'decode_UCO_Ratio_st' defined but not used
packet-gias.c:5303: warning: 'decode_UCO_DirectAccessLocation_st' defined but not used
packet-gias.c:5588: warning: 'decode_UCO_Coordinate3d_st' defined but not used
packet-gias.c:5612: warning: 'decode_UCO_Circle_st' defined but not used
packet-gias.c:5625: warning: 'decode_UCO_Ellipse_st' defined but not used
packet-gias.c:5656: warning: 'decode_UCO_SimpleGSImage_st' defined but not used
packet-gias.c:5671: warning: 'decode_UCO_SimpleCImage_st' defined but not used
packet-gias.c:5694: warning: 'decode_UCO_CompressedImage_st' defined but not used
packet-gias.c:5836: warning: 'decode_GIAS_ImageSpec_st' defined but not used
Change-Id: Iee076c00eb4e48571a99f6b854b7e3e52983c2f8
Reviewed-on: https://code.wireshark.org/review/8265
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-cosnaming.c')
| -rw-r--r-- | epan/dissectors/packet-cosnaming.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c index 4977a3c890..4c9b28ba1c 100644 --- a/epan/dissectors/packet-cosnaming.c +++ b/epan/dissectors/packet-cosnaming.c @@ -143,7 +143,7 @@ static const value_string CosNaming_NamingContext_NotFoundReason[] = { static void decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { - proto_item *item = NULL; + proto_item *item _U_; /* Operation specific Variable declarations Begin */ guint32 u_octet4; @@ -151,6 +151,8 @@ decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo guint32 i_CosNaming_NamingContext_NotFound_rest_of_name; /* Operation specific Variable declarations End */ + (void)item; /* Avoid coverity param_set_but_unused parse warning */ + u_octet4 = get_CDR_enum(tvb,offset,stream_is_big_endian, boundary); /* coverity[returned_pointer] */ item = proto_tree_add_uint(tree, hf_CosNaming_NamingContext_NotFound_why, tvb, *offset-4, 4, u_octet4); @@ -172,13 +174,15 @@ decode_ex_CosNaming_NamingContext_NotFound(tvbuff_t *tvb _U_, packet_info *pinfo static void decode_ex_CosNaming_NamingContext_CannotProceed(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, int *offset _U_, MessageHeader *header _U_, const gchar *operation _U_, gboolean stream_is_big_endian _U_) { - proto_item *item = NULL; + proto_item *item _U_; /* Operation specific Variable declarations Begin */ guint32 u_octet4_loop_CosNaming_NamingContext_CannotProceed_rest_of_name; guint32 i_CosNaming_NamingContext_CannotProceed_rest_of_name; /* Operation specific Variable declarations End */ + (void)item; /* Avoid coverity param_set_but_unused parse warning */ + get_CDR_object(tvb, pinfo, tree, offset, stream_is_big_endian, boundary); u_octet4_loop_CosNaming_NamingContext_CannotProceed_rest_of_name = get_CDR_ulong(tvb, offset, stream_is_big_endian, boundary); |