diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/asn1/p22 | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/asn1/p22')
| -rw-r--r-- | epan/dissectors/asn1/p22/p22.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/asn1/p22/packet-p22-template.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/asn1/p22/p22.cnf b/epan/dissectors/asn1/p22/p22.cnf index 6b610c69..5e706d7c 100644 --- a/epan/dissectors/asn1/p22/p22.cnf +++ b/epan/dissectors/asn1/p22/p22.cnf @@ -280,11 +280,11 @@ VideotexData DISPLAY = BASE_NONE VAL_PTR=&crs #.FN_BODY CharacterSetRegistration - guint32 crs; + uint32_t crs; %(DEFAULT_BODY)s if(actx->created_item) - proto_item_append_text(actx->created_item, " (%%s)", val_to_str(crs, charsetreg_vals, "unknown")); + proto_item_append_text(actx->created_item, " (%%s)", val_to_str_const(crs, charsetreg_vals, "unknown")); #.FN_BODY Interchange-Data-Element /* XXX Not implemented yet */ diff --git a/epan/dissectors/asn1/p22/packet-p22-template.c b/epan/dissectors/asn1/p22/packet-p22-template.c index fe7d4d2d..b806d670 100644 --- a/epan/dissectors/asn1/p22/packet-p22-template.c +++ b/epan/dissectors/asn1/p22/packet-p22-template.c @@ -15,6 +15,7 @@ #include <epan/oids.h> #include <epan/asn1.h> #include <epan/proto_data.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-acse.h" @@ -33,7 +34,7 @@ #define PFNAME "p22" /* Initialize the protocol and registered fields */ -static int proto_p22 = -1; +static int proto_p22; static const value_string charsetreg_vals [] = { { 1, "C0: (ISO/IEC 6429)"}, @@ -69,7 +70,7 @@ static const value_string charsetreg_vals [] = { #include "packet-p22-hf.c" /* Initialize the subtree pointers */ -static gint ett_p22 = -1; +static int ett_p22; #include "packet-p22-ett.c" #include "packet-p22-fn.c" @@ -84,7 +85,7 @@ dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da 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_p22, tvb, 0, -1, ENC_NA); @@ -94,7 +95,7 @@ dissect_p22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* da col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22"); col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal"); - dissect_p22_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1); + dissect_p22_InformationObject(true, tvb, offset, &asn1_ctx , tree, -1); return tvb_captured_length(tvb); } @@ -109,7 +110,7 @@ void proto_register_p22(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_p22, #include "packet-p22-ettarr.c" }; |