Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 17 deletions

diff --git a/epan/dissectors/asn1/h450/packet-h450-template.c b/epan/dissectors/asn1/h450/packet-h450-template.c
index b9a72714..d2938ddd 100644
--- a/epan/dissectors/asn1/h450/packet-h450-template.c
+++ b/epan/dissectors/asn1/h450/packet-h450-template.c
@@ -20,6 +20,7 @@
 #include <epan/expert.h>
 
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-per.h"
 #include "packet-h225.h"
@@ -38,17 +39,17 @@ static dissector_handle_t h450_res_handle;
 static dissector_handle_t h450_err_handle;
 
 /* Initialize the protocol and registered fields */
-static int proto_h450 = -1;
-static int hf_h450_operation = -1;
-static int hf_h450_error = -1;
+static int proto_h450;
+static int hf_h450_operation;
+static int hf_h450_error;
 #include "packet-h450-hf.c"
 
 /* Initialize the subtree pointers */
 #include "packet-h450-ett.c"
 
-static expert_field ei_h450_unsupported_arg_type = EI_INIT;
-static expert_field ei_h450_unsupported_result_type = EI_INIT;
-static expert_field ei_h450_unsupported_error_type = EI_INIT;
+static expert_field ei_h450_unsupported_arg_type;
+static expert_field ei_h450_unsupported_result_type;
+static expert_field ei_h450_unsupported_error_type;
 
 static const value_string h450_str_operation[] = {
 #include "packet-h450-table10.c"
@@ -68,7 +69,7 @@ static rose_ctx_t h450_rose_ctx;
 #include "packet-h450-fn.c"
 
 typedef struct _h450_op_t {
-  gint32 opcode;
+  int32_t opcode;
   dissector_t arg_pdu;
   dissector_t res_pdu;
 } h450_op_t;
@@ -78,7 +79,7 @@ static const h450_op_t h450_op_tab[] = {
 };
 
 typedef struct _h450_err_t {
-  gint32 errcode;
+  int32_t errcode;
   dissector_t err_pdu;
 } h450_err_t;
 
@@ -86,7 +87,7 @@ static const h450_err_t h450_err_tab[] = {
 #include "packet-h450-table21.c"
 };
 
-static const h450_op_t *get_op(gint32 opcode) {
+static const h450_op_t *get_op(int32_t opcode) {
   int i;
 
   /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
@@ -96,7 +97,7 @@ static const h450_op_t *get_op(gint32 opcode) {
   return NULL;
 }
 
-static const h450_err_t *get_err(gint32 errcode) {
+static const h450_err_t *get_err(int32_t errcode) {
   int i;
 
   /* search from the end to get the last occurrence if the operation is redefined in some newer specification */
@@ -112,9 +113,9 @@ dissect_h450_arg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
   proto_item *hidden_item;
   int offset = 0;
   rose_ctx_t *rctx;
-  gint32 opcode;
+  int32_t opcode;
   const h450_op_t *op_ptr;
-  const gchar *p;
+  const char *p;
 
   /* Reject the packet if data is NULL */
   if (data == NULL)
@@ -157,9 +158,9 @@ dissect_h450_res(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
   proto_item *hidden_item;
   int offset = 0;
   rose_ctx_t *rctx;
-  gint32 opcode;
+  int32_t opcode;
   const h450_op_t *op_ptr;
-  const gchar *p;
+  const char *p;
 
   /* Reject the packet if data is NULL */
   if (data == NULL)
@@ -202,9 +203,9 @@ dissect_h450_err(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
   proto_item *hidden_item;
   int offset = 0;
   rose_ctx_t *rctx;
-  gint32 errcode;
+  int32_t errcode;
   const h450_err_t *err_ptr;
-  const gchar *p;
+  const char *p;
 
   /* Reject the packet if data is NULL */
   if (data == NULL)
@@ -256,7 +257,7 @@ void proto_register_h450(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
 #include "packet-h450-ettarr.c"
   };