diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-07-03 23:43:26 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-07-03 23:43:26 +0000 |
| commit | 7878e93cad7b9604892a73c6041d352d39acccb9 (patch) | |
| tree | b2a1ab23fccbe66387e242bc99b4ceaa350b8582 /asn1/gsm_map/packet-gsm_map-template.c | |
| parent | 242e18dace4d2db1c9b1a7345b0a1d25a1bd7f0a (diff) | |
| download | wireshark-7878e93cad7b9604892a73c6041d352d39acccb9.tar.gz | |
expert_add_info_format_text + proto_tree_add_text = proto_tree_add_expert_format, where applicable.
svn path=/trunk/; revision=50377
Diffstat (limited to 'asn1/gsm_map/packet-gsm_map-template.c')
| -rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 849b2b4d34..c9295114bd 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -1005,8 +1005,6 @@ static int dissect_mc_message(tvbuff_t *tvb, static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { - proto_item *cause; - switch(opcode){ case 2: /*updateLocation*/ offset=dissect_gsm_map_ms_UpdateLocationArg(FALSE, tvb, offset, actx, tree, -1); @@ -1353,8 +1351,8 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ break; default: if(!dissector_try_uint(map_prop_arg_opcode_table, (guint8)opcode, tvb, actx->pinfo, tree)){ - cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown invokeData blob"); - expert_add_info_format_text(actx->pinfo, cause, &ei_gsm_map_unknown_invokeData, "Unknown invokeData %d",opcode); + proto_tree_add_expert_format(tree, actx->pinfo, &ei_gsm_map_unknown_invokeData, + tvb, offset, -1, "Unknown invokeData %d", opcode); } offset+= tvb_length_remaining(tvb,offset); break; @@ -1365,8 +1363,6 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { - proto_item *cause; - switch(opcode){ case 2: /*updateLocation*/ offset=dissect_mc_message(tvb, offset, actx, tree, @@ -1660,8 +1656,8 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, default: if(!dissector_try_uint(map_prop_res_opcode_table, (guint8)opcode, tvb, actx->pinfo, tree)){ - cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnResultData blob"); - expert_add_info_format_text(actx->pinfo, cause, &ei_gsm_map_unknown_invokeData, "Unknown invokeData %d",opcode); + proto_tree_add_expert_format(tree, actx->pinfo, &ei_gsm_map_unknown_invokeData, + tvb, offset, -1, "Unknown returnResultData %d", opcode); } offset+= tvb_length_remaining(tvb,offset); break; @@ -1672,7 +1668,6 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { - proto_item *cause; switch(errorCode){ case 1: /* UnknownSubscriberParam */ @@ -1824,8 +1819,8 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset, break; default: if(!dissector_try_uint(map_prop_err_opcode_table, (guint8)opcode, tvb, actx->pinfo, tree)){ - cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnErrorData blob"); - expert_add_info_format_text(actx->pinfo, cause, &ei_gsm_map_unknown_invokeData, "Unknown invokeData %d",errorCode); + proto_tree_add_expert_format(tree, actx->pinfo, &ei_gsm_map_unknown_invokeData, + tvb, offset, -1, "Unknown returnErrorData %d", opcode); } offset+= tvb_length_remaining(tvb,offset); break; |