Merging upstream version 4.4.0.

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

2 files changed, 25 insertions, 24 deletions

diff --git a/epan/dissectors/asn1/h283/h283.cnf b/epan/dissectors/asn1/h283/h283.cnf
index 0f7577cc..3a12fba1 100644
--- a/epan/dissectors/asn1/h283/h283.cnf
+++ b/epan/dissectors/asn1/h283/h283.cnf
@@ -14,78 +14,78 @@ LCTPDU
 #.FN_PARS LCTPDU/pduType
   VAL_PTR = &pdu_type
 #.FN_HDR
-  gint32 pdu_type = -1;
-  const gchar *p = NULL;
+  int32_t pdu_type = -1;
+  const char *p = NULL;
 #.FN_FTR
   p = try_val_to_str(pdu_type, VALS(h283_T_pduType_vals));
   if (!info_is_set && p ) {
     col_set_str(actx->pinfo->cinfo, COL_INFO, p);
-    info_is_set = TRUE;
+    info_is_set = true;
   }
 #.END
 
 #.FN_PARS RDCData/dataType
   VAL_PTR = &data_type
 #.FN_HDR
-  gint32 data_type = -1;
-  const gchar *p = NULL;
+  int32_t data_type = -1;
+  const char *p = NULL;
 #.FN_FTR
   p = try_val_to_str(data_type, VALS(h283_T_dataType_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "RDCData/%s", p);
-    info_is_set = TRUE;
+    info_is_set = true;
   }
 #.END
 
 #.FN_PARS LCTMessage
   VAL_PTR = &msg_type
 #.FN_HDR
-  gint32 msg_type = -1;
-  const gchar *p = NULL;
+  int32_t msg_type = -1;
+  const char *p = NULL;
 #.FN_FTR
   p = try_val_to_str(msg_type, VALS(h283_LCTMessage_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTMessage/%s", p);
-    info_is_set = TRUE;
+    info_is_set = true;
   }
 #.END
 
 #.FN_PARS LCTRequest
   VAL_PTR = &msg_type
 #.FN_HDR
-  gint32 msg_type = -1;
-  const gchar *p = NULL;
+  int32_t msg_type = -1;
+  const char *p = NULL;
 #.FN_FTR
   p = try_val_to_str(msg_type, VALS(h283_LCTRequest_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTRequest/%s", p);
-    info_is_set = TRUE;
+    info_is_set = true;
   }
 #.END
 
 #.FN_PARS LCTResponse
   VAL_PTR = &msg_type
 #.FN_HDR
-  gint32 msg_type = -1;
-  const gchar *p = NULL;
+  int32_t msg_type = -1;
+  const char *p = NULL;
 #.FN_FTR
   p = try_val_to_str(msg_type, VALS(h283_LCTResponse_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTResponse/%s", p);
-    info_is_set = TRUE;
+    info_is_set = true;
   }
 #.END
 
 #.FN_PARS LCTIndication
   VAL_PTR = &msg_type
 #.FN_HDR
-  gint32 msg_type = -1;
-  const gchar *p = NULL;
+  int32_t msg_type = -1;
+  const char *p = NULL;
 #.FN_FTR
   p = try_val_to_str(msg_type, VALS(h283_LCTIndication_vals));
   if (!info_is_set && p ) {
     col_add_fstr(actx->pinfo->cinfo, COL_INFO, "LCTIndication/%s", p);
-    info_is_set = TRUE;
+    info_is_set = true;
   }
 #.END
 
@@ -96,7 +96,7 @@ LCTPDU
   if (next_tvb && tvb_reported_length(next_tvb)) {
     call_dissector((rdc_pdu_handle)?rdc_pdu_handle:data_handle, next_tvb, %(ACTX)s->pinfo, proto_tree_get_root(tree));
   }
-  info_is_set = TRUE;
+  info_is_set = true;
 #.END
 
 #.FN_BODY LCTResponse/deviceListResp  VAL_PTR = &next_tvb
diff --git a/epan/dissectors/asn1/h283/packet-h283-template.c b/epan/dissectors/asn1/h283/packet-h283-template.c
index 6db8e76e..3d7e42e7 100644
--- a/epan/dissectors/asn1/h283/packet-h283-template.c
+++ b/epan/dissectors/asn1/h283/packet-h283-template.c
@@ -14,6 +14,7 @@
 #include <epan/packet.h>
 #include <epan/oids.h>
 #include <epan/asn1.h>
+#include <wsutil/array.h>
 
 #include "packet-per.h"
 
@@ -25,11 +26,11 @@ void proto_register_h283(void);
 void proto_reg_handoff_h283(void);
 
 /* Initialize the protocol and registered fields */
-static int proto_h283 = -1;
+static int proto_h283;
 #include "packet-h283-hf.c"
 
 /* Initialize the subtree pointers */
-static int ett_h283 = -1;
+static int ett_h283;
 #include "packet-h283-ett.c"
 
 /* Subdissectors */
@@ -39,7 +40,7 @@ static dissector_handle_t data_handle;
 static dissector_handle_t h283_udp_handle;
 
 
-static gboolean info_is_set;
+static bool info_is_set;
 
 #include "packet-h283-fn.c"
 
@@ -51,7 +52,7 @@ dissect_h283_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
 
-  info_is_set = FALSE;
+  info_is_set = false;
 
   ti = proto_tree_add_item(tree, proto_h283, tvb, 0, -1, ENC_NA);
   h283_tree = proto_item_add_subtree(ti, ett_h283);
@@ -68,7 +69,7 @@ void proto_register_h283(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_h283,
 #include "packet-h283-ettarr.c"
   };