Merging upstream version 4.4.0.

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

2 files changed, 13 insertions, 12 deletions

diff --git a/epan/dissectors/asn1/h323/packet-h323-template.c b/epan/dissectors/asn1/h323/packet-h323-template.c
index 8adbaa7c..6c321bee 100644
--- a/epan/dissectors/asn1/h323/packet-h323-template.c
+++ b/epan/dissectors/asn1/h323/packet-h323-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"
 #include "packet-h225.h"
@@ -27,7 +28,7 @@ void proto_register_h323(void);
 void proto_reg_handoff_h323(void);
 
 /* Generic Extensible Framework */
-gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const gchar *type) {
+gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const char *type) {
   gef_ctx_t *gefx;
 
   gefx = wmem_new0(pool, gef_ctx_t);
@@ -37,7 +38,7 @@ gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const gchar
   return gefx;
 }
 
-gboolean gef_ctx_check_signature(gef_ctx_t *gefx) {
+bool gef_ctx_check_signature(gef_ctx_t *gefx) {
   return gefx && (gefx->signature == GEF_CTX_SIGNATURE);
 }
 
@@ -58,7 +59,7 @@ gef_ctx_t* gef_ctx_get(void *ptr) {
 }
 
 void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx) {
-  const gchar *parent_key;
+  const char *parent_key;
 
   if (!gefx) return;
   parent_key = (gefx->parent) ? gefx->parent->key : NULL;
@@ -73,7 +74,7 @@ void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx) {
 }
 
 /* Initialize the protocol and registered fields */
-static int proto_h323 = -1;
+static int proto_h323;
 #include "packet-h323-hf.c"
 
 /* Initialize the subtree pointers */
@@ -90,7 +91,7 @@ void proto_register_h323(void) {
   };
 
   /* List of subtrees */
-  static gint *ett[] = {
+  static int *ett[] = {
 #include "packet-h323-ettarr.c"
   };
 
diff --git a/epan/dissectors/asn1/h323/packet-h323-template.h b/epan/dissectors/asn1/h323/packet-h323-template.h
index 0467a4a0..d4b5d5b7 100644
--- a/epan/dissectors/asn1/h323/packet-h323-template.h
+++ b/epan/dissectors/asn1/h323/packet-h323-template.h
@@ -17,7 +17,7 @@
 #define GEF_CTX_SIGNATURE 0x47454658  /* "GEFX" */
 
 typedef struct _gef_ctx_t {
-  guint32 signature;
+  uint32_t signature;
   struct _gef_ctx_t *parent;
   /*
     H323-MESSAGES
@@ -37,14 +37,14 @@ typedef struct _gef_ctx_t {
       EncryptionSync
         <id>
   */
-  const gchar *type;
-  const gchar *id;
-  const gchar *subid;
-  const gchar *key;
+  const char *type;
+  const char *id;
+  const char *subid;
+  const char *key;
 } gef_ctx_t;
 
-extern gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const gchar *type);
-extern gboolean gef_ctx_check_signature(gef_ctx_t *gefx);
+extern gef_ctx_t* gef_ctx_alloc(wmem_allocator_t *pool, gef_ctx_t *parent, const char *type);
+extern bool gef_ctx_check_signature(gef_ctx_t *gefx);
 extern gef_ctx_t* gef_ctx_get(void *ptr);
 extern void gef_ctx_update_key(wmem_allocator_t *pool, gef_ctx_t *gefx);