diff options
| -rw-r--r-- | asn1/cmip/packet-cmip-template.c | 16 | ||||
| -rw-r--r-- | epan/dissectors/packet-cmip.c | 22 |
2 files changed, 15 insertions, 23 deletions
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 88b292e092..30c94d1915 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -108,18 +108,14 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* do we have spdu type from the session dissector? */ if( !session ){ - if(tree){ - proto_tree_add_text(tree, tvb, 0, -1, - "Internal error:can't get spdu type from session dissector."); - return; - } + proto_tree_add_text(tree, tvb, 0, -1, + "Internal error:can't get spdu type from session dissector."); + return; } else { if(session->spdu_type == 0 ) { - if(tree){ - proto_tree_add_text(tree, tvb, 0, -1, - "Internal error:wrong spdu type %x from session dissector.",session->spdu_type); - return; - } + proto_tree_add_text(tree, tvb, 0, -1, + "Internal error:wrong spdu type %x from session dissector.",session->spdu_type); + return; } } diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index e8607f4d95..f813241f51 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -4400,18 +4400,14 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* do we have spdu type from the session dissector? */ if( !session ){ - if(tree){ - proto_tree_add_text(tree, tvb, 0, -1, - "Internal error:can't get spdu type from session dissector."); - return; - } + proto_tree_add_text(tree, tvb, 0, -1, + "Internal error:can't get spdu type from session dissector."); + return; } else { if(session->spdu_type == 0 ) { - if(tree){ - proto_tree_add_text(tree, tvb, 0, -1, - "Internal error:wrong spdu type %x from session dissector.",session->spdu_type); - return; - } + proto_tree_add_text(tree, tvb, 0, -1, + "Internal error:wrong spdu type %x from session dissector.",session->spdu_type); + return; } } @@ -5584,7 +5580,7 @@ void proto_register_cmip(void) { NULL, HFILL }}, /*--- End of included file: packet-cmip-hfarr.c ---*/ -#line 193 "packet-cmip-template.c" +#line 187 "packet-cmip-template.c" }; /* List of subtrees */ @@ -5716,7 +5712,7 @@ void proto_register_cmip(void) { &ett_cmip_T_modificationList_item, /*--- End of included file: packet-cmip-ettarr.c ---*/ -#line 199 "packet-cmip-template.c" +#line 193 "packet-cmip-template.c" }; /* Register protocol */ @@ -5801,7 +5797,7 @@ void proto_register_cmip(void) { /*--- End of included file: packet-cmip-dis-tab.c ---*/ -#line 208 "packet-cmip-template.c" +#line 202 "packet-cmip-template.c" oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1"); } |