aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-cosnaming.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-04-30 22:38:20 -0400
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2015-05-01 08:36:42 +0000
commit3ca9318d8215738b8d4edcde0598226cfc6cf031 (patch)
treecfe813ea7bc236829a3fd4cb58d4bc5fcfaddc36 /epan/dissectors/packet-cosnaming.c
parentaa3870f54d2006237c63cad6e0245cab590b57b5 (diff)
Fix the need to manually adjust packet-gias.c
Change-Id: I11beada78d2f2b4359d3638cdbcb6f43623fd10c Reviewed-on: https://code.wireshark.org/review/8262 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-cosnaming.c')
-rw-r--r--epan/dissectors/packet-cosnaming.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-cosnaming.c b/epan/dissectors/packet-cosnaming.c
index 4c9b28ba1c..4977a3c890 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 _U_;
+ proto_item *item = NULL;
/* Operation specific Variable declarations Begin */
guint32 u_octet4;
@@ -151,8 +151,6 @@ 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);
@@ -174,15 +172,13 @@ 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 _U_;
+ proto_item *item = NULL;
/* 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);