diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-07-09 02:58:07 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-07-09 02:58:07 +0000 |
commit | b6c317847386c5b168960d520e41c588106eca78 (patch) | |
tree | cd44c0940cfd4399a059bb4e41488224a6e89cb5 /epan/dissectors/packet-acse.c | |
parent | 4ba230c139d811a8bbc80afa2394ccba99a5f76e (diff) |
Fix up a bunch of arguments to "dissect_ber_identifier()" to match its
current signature ("class" is a "gint8 *", not a "guint8 *", and "tag"
is a "gint32 *", not a "guint32 *"). Re-generate the dissectors from
the ASN.1 and the .cnf files in the cases where the arguments were fixed
in a .cnf file.
Give some dissectors the right svn:keywords and svn:eol-style settings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14885 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-acse.c')
-rw-r--r-- | epan/dissectors/packet-acse.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index f6f8cbe36d..7fa07a7483 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -378,10 +378,11 @@ static int dissect_single_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff } + static int dissect_acse_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -444,7 +445,7 @@ dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack gint8 class; gboolean pc, ind_field; gint32 tag; - gint32 len1; + guint32 len1; /* XXX asn2eth can not yet handle tagged assignment so for the * time being just remove this tag manually inside the EXTERNAL @@ -1477,7 +1478,8 @@ static const value_string acse_ABRT_diagnostic_vals[] = { static int dissect_acse_ABRT_diagnostic(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; } @@ -1520,10 +1522,11 @@ static int dissect_user_information_impl(packet_info *pinfo, proto_tree *tree, t } + static int dissect_acse_Simply_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } |