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/q932-ros | |
| 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/q932-ros')
| -rw-r--r-- | epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c | 13 | ||||
| -rw-r--r-- | epan/dissectors/asn1/q932-ros/q932-ros.cnf | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c b/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c index e8074eea..2663d442 100644 --- a/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c +++ b/epan/dissectors/asn1/q932-ros/packet-q932-ros-template.c @@ -15,6 +15,7 @@ #include <epan/strutil.h> #include <epan/asn1.h> #include <epan/expert.h> +#include <wsutil/array.h> #include "packet-ber.h" @@ -26,24 +27,24 @@ void proto_register_q932_ros(void); void proto_reg_handoff_q932_ros(void); /* Initialize the protocol and registered fields */ -static int proto_q932_ros = -1; +static int proto_q932_ros; #include "packet-q932-ros-hf.c" /* Initialize the subtree pointers */ #include "packet-q932-ros-ett.c" -static expert_field ei_ros_undecoded = EI_INIT; +static expert_field ei_ros_undecoded; /* Preferences */ /* Subdissectors */ -static dissector_handle_t data_handle = NULL; +static dissector_handle_t data_handle; /* Global variables */ static rose_ctx_t *rose_ctx_tmp; -static guint32 problem_val; -static gchar problem_str[64]; +static uint32_t problem_val; +static char problem_str[64]; static tvbuff_t *arg_next_tvb, *res_next_tvb, *err_next_tvb; @@ -68,7 +69,7 @@ void proto_register_q932_ros(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { #include "packet-q932-ros-ettarr.c" }; diff --git a/epan/dissectors/asn1/q932-ros/q932-ros.cnf b/epan/dissectors/asn1/q932-ros/q932-ros.cnf index 1bc11692..ad90299d 100644 --- a/epan/dissectors/asn1/q932-ros/q932-ros.cnf +++ b/epan/dissectors/asn1/q932-ros/q932-ros.cnf @@ -65,7 +65,7 @@ ReturnErrorProblem VAL_PTR = &problem_val Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY Invoke/argument - gint len; + int len; len = tvb_reported_length_remaining(tvb, offset); if (len) @@ -83,7 +83,7 @@ Invoke/argument TYPE = FT_BYTES DISPLAY = BASE_NONE ReturnResult/result/result TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY ReturnResult/result/result - gint len; + int len; len = tvb_reported_length_remaining(tvb, offset); if (len) @@ -103,7 +103,7 @@ ReturnError/parameter TYPE = FT_BYTES DISPLAY = BASE_NONE #.FN_BODY ReturnError/parameter - gint len; + int len; len = tvb_reported_length_remaining(tvb, offset); if (len) |