Merging upstream version 4.4.0.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index cf7fee3f..8e9d360d 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -16,11 +16,11 @@
 void proto_register_qllc(void);
 void proto_reg_handoff_qllc(void);
 
-static int proto_qllc = -1;
-static int hf_qllc_address = -1;
-static int hf_qllc_control = -1;
+static int proto_qllc;
+static int hf_qllc_address;
+static int hf_qllc_control;
 
-static gint ett_qllc = -1;
+static int ett_qllc;
 
 static dissector_handle_t sna_handle;
 
@@ -63,14 +63,14 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
     proto_tree *qllc_tree;
     proto_item *qllc_ti;
-    gboolean   *q_bit_set;
-    guint8      addr, ctrl;
-    gboolean    command = FALSE;
+    bool       *q_bit_set;
+    uint8_t     addr, ctrl;
+    bool        command = false;
 
     /* Reject the packet if data is NULL */
     if (data == NULL)
         return 0;
-    q_bit_set = (gboolean *)data;
+    q_bit_set = (bool *)data;
 
     /*
      * If the Q bit isn't set, this is just SNA data.
@@ -89,14 +89,14 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 
     /* Get the address; we need it to determine if this is a
      * COMMAND or a RESPONSE */
-    addr = tvb_get_guint8(tvb, 0);
+    addr = tvb_get_uint8(tvb, 0);
     proto_tree_add_item(qllc_tree, hf_qllc_address, tvb, 0, 1, ENC_BIG_ENDIAN);
 
     /* The address field equals X'FF' in commands (except QRR)
      * and anything in responses. */
-    ctrl = tvb_get_guint8(tvb, 1);
+    ctrl = tvb_get_uint8(tvb, 1);
     if (ctrl != QRR && addr == 0xff) {
-        command = TRUE;
+        command = true;
     }
 
 
@@ -147,7 +147,7 @@ proto_register_qllc(void)
             VALS(qllc_control_vals), 0x0, NULL, HFILL }},
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_qllc,
     };