diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-06-26 05:48:50 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-06-26 05:48:50 +0000 |
| commit | 3a51ba4293f6d98309471aeee7f2b1010c96b7cb (patch) | |
| tree | 1bfaf8b92a640262162e7f0432a43a84d0381e6d /asn1/gsmmap | |
| parent | cc3b0df4caeb0c7ba1e168e5b91837e1c5243929 (diff) | |
make dissect_ber_choice take a guint* that will return the
index of the branch taken or -1 to make prettifications easier to implement.
change the signature of dissect_ber_choice and rename it to dissect_ber_CHOICE to catch all
occurences of the use of this function
update asn2eth to use the new name/signature
update all occurences of this function to the new name and new signature.
svn path=/trunk/; revision=14758
Diffstat (limited to 'asn1/gsmmap')
| -rw-r--r-- | asn1/gsmmap/packet-gsm_map-template.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c index 514fc3e89b..22b8dd0f1a 100644 --- a/asn1/gsmmap/packet-gsm_map-template.c +++ b/asn1/gsmmap/packet-gsm_map-template.c @@ -874,8 +874,8 @@ static const ber_choice_t InvokeId_choice[] = { static int dissect_gsm_map_InvokeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - InvokeId_choice, hf_index, ett_gsm_map_InvokeId); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + InvokeId_choice, hf_index, ett_gsm_map_InvokeId, NULL); return offset; } @@ -952,8 +952,8 @@ static const ber_choice_t ReturnError_result_choice[] = { static int dissect_ReturnError_result(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + ReturnError_result_choice, hf_gsm_map_returnError_result, ett_gsm_map_ReturnError_result, NULL); return offset; } @@ -1020,8 +1020,8 @@ dissect_gsm_map_GSMMAPPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, col_set_str(pinfo->cinfo, COL_INFO, val_to_str(gsmmap_pdu_type, GSMMAPPDU_vals, "Unknown GSM-MAP PDU (%u)")); } - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + GSMMAPPDU_choice, hf_index, ett_gsm_map_GSMMAPPDU, NULL); return offset; |