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/camel | |
| parent | 242e18dace4d2db1c9b1a7345b0a1d25a1bd7f0a (diff) | |
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/camel')
| -rw-r--r-- | asn1/camel/camel.cnf | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 43002894d9..06d1f9e07d 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -110,7 +110,6 @@ static const value_string camel_err_code_string_vals[] = { # #.TABLE2_HDR static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ctx_t *actx) { - proto_item *cause; switch(opcode){ #.TABLE2_BODY OPERATION.&ArgumentType @@ -119,9 +118,8 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ break; #.TABLE2_FTR default: - cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown invokeData blob"); - proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN); - expert_add_info_format_text(actx->pinfo, cause, &ei_camel_unknown_invokeData, "Unknown invokeData %d",opcode); + proto_tree_add_expert_format(tree, actx->pinfo, &ei_camel_unknown_invokeData, + tvb, offset, -1, "Unknown invokeData %d", opcode); /* todo call the asn.1 dissector */ break; } @@ -130,7 +128,6 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ #.END #.TABLE2_HDR static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset,asn1_ctx_t *actx) { - proto_item *cause; switch(opcode){ #.TABLE2_BODY OPERATION.&ResultType @@ -139,16 +136,14 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, break; #.TABLE2_FTR default: - cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnResultData blob"); - proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN); - expert_add_info_format_text(actx->pinfo, cause, &ei_camel_unknown_returnResultData, "Unknown returnResultData %d",opcode); + proto_tree_add_expert_format(tree, actx->pinfo, &ei_camel_unknown_returnResultData, + tvb, offset, -1, "Unknown returnResultData %d",opcode); } return offset; } #.END #.TABLE2_HDR static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,asn1_ctx_t *actx) { - proto_item *cause; switch(errorCode) { #.TABLE2_BODY ERROR.&ParameterType @@ -157,9 +152,8 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a break; #.TABLE2_FTR default: - cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnErrorData blob"); - proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN); - expert_add_info_format_text(actx->pinfo, cause, &ei_camel_unknown_returnErrorData, "Unknown returnErrorData %d",errorCode); + proto_tree_add_expert_format(tree, actx->pinfo, &ei_camel_unknown_returnErrorData, + tvb, offset, -1, "Unknown returnErrorData %d",errorCode); } return offset; } |