diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
| commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
| tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/asn1/p772 | |
| parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
| download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/p772')
| -rw-r--r-- | epan/dissectors/asn1/p772/packet-p772-template.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/p772/packet-p772-template.c b/epan/dissectors/asn1/p772/packet-p772-template.c index 4b20d84e..93f690d5 100644 --- a/epan/dissectors/asn1/p772/packet-p772-template.c +++ b/epan/dissectors/asn1/p772/packet-p772-template.c @@ -13,6 +13,7 @@ #include <epan/packet.h> #include <epan/asn1.h> +#include <wsutil/array.h> #include "packet-ber.h" @@ -31,14 +32,14 @@ void proto_reg_handoff_p772(void); /* Initialize the protocol and registered fields */ -static int proto_p772 = -1; +static int proto_p772; #include "packet-p772-val.h" #include "packet-p772-hf.c" /* Initialize the subtree pointers */ -static gint ett_p772 = -1; +static int ett_p772; #include "packet-p772-ett.c" #include "packet-p772-fn.c" @@ -54,7 +55,7 @@ dissect_p772(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d proto_item *item=NULL; proto_tree *tree=NULL; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_p772, tvb, 0, -1, ENC_NA); @@ -64,7 +65,7 @@ dissect_p772(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d col_set_str(pinfo->cinfo, COL_PROTOCOL, "P772"); col_set_str(pinfo->cinfo, COL_INFO, "Military"); - dissect_p772_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1); + dissect_p772_InformationObject(true, tvb, offset, &asn1_ctx , tree, -1); return tvb_captured_length(tvb); } @@ -80,7 +81,7 @@ void proto_register_p772(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_p772, #include "packet-p772-ettarr.c" }; |