diff options
| author | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-06-26 05:48:50 +0000 |
|---|---|---|
| committer | sahlberg <sahlberg@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-06-26 05:48:50 +0000 |
| commit | b0a6e02e5b8e8e84673c904a371d2b99152eaad3 (patch) | |
| tree | 1bfaf8b92a640262162e7f0432a43a84d0381e6d /epan/dissectors/packet-pkixqualified.c | |
| parent | 4796e185b2503b9eba23480eb93f52ab02d07266 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14758 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-pkixqualified.c')
| -rw-r--r-- | epan/dissectors/packet-pkixqualified.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 9ef95d6171..b5d87e402e 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -144,7 +144,8 @@ static const value_string pkixqualified_PredefinedBiometricType_vals[] = { static int dissect_pkixqualified_PredefinedBiometricType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); + offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -153,10 +154,11 @@ static int dissect_predefinedBiometricType(packet_info *pinfo, proto_tree *tree, } + static int dissect_pkixqualified_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, - hf_index, NULL); + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -182,8 +184,8 @@ static const ber_choice_t TypeOfBiometricData_choice[] = { static int dissect_pkixqualified_TypeOfBiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_choice(pinfo, tree, tvb, offset, - TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData); + offset = dissect_ber_CHOICE(pinfo, tree, tvb, offset, + TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, NULL); return offset; } @@ -248,6 +250,7 @@ dissect_pkixqualified_BiometricSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, } + static int dissect_pkixqualified_T_statementId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, |