Merging upstream version 4.4.0.

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

1 files changed, 14 insertions, 14 deletions

diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index ef1439ee..a5691490 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -26,38 +26,38 @@ void proto_reg_handoff_pktgen(void);
 #define PKTGEN_MAGIC 0xbe9be955
 
 /* Initialize the protocol and registered fields */
-static int proto_pktgen = -1;
+static int proto_pktgen;
 
 /* pktgen header */
-static int hf_pktgen_magic = -1;
-static int hf_pktgen_seqnum = -1;
-static int hf_pktgen_tvsec = -1;
-static int hf_pktgen_tvusec = -1;
-static int hf_pktgen_timestamp = -1;
+static int hf_pktgen_magic;
+static int hf_pktgen_seqnum;
+static int hf_pktgen_tvsec;
+static int hf_pktgen_tvusec;
+static int hf_pktgen_timestamp;
 
 /* Initialize the subtree pointer */
-static gint ett_pktgen = -1;
+static int ett_pktgen;
 
 /* entry point */
-static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+static bool dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
     proto_item *ti          = NULL;
     proto_item *tmp         = NULL;
     proto_tree *pktgen_tree = NULL;
-    guint32     offset      = 0;
+    uint32_t    offset      = 0;
     nstime_t    tstamp;
-    guint32     magic;
+    uint32_t    magic;
 
     /* check for min size */
     if (tvb_reported_length(tvb) < 16) {  /* Not a PKTGEN packet. */
-        return FALSE;
+        return false;
     }
 
     /* check for magic number */
     magic = tvb_get_ntohl(tvb,0);
     if (magic != PKTGEN_MAGIC) {
         /* Not a PKTGEN packet. */
-        return FALSE;
+        return false;
     }
 
 
@@ -100,7 +100,7 @@ static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
             pktgen_tree);
     }
 
-    return TRUE;
+    return true;
 }
 
 
@@ -154,7 +154,7 @@ void proto_register_pktgen(void)
 
     /* Setup protocol subtree array */
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_pktgen
     };