1 files changed, 20 insertions, 20 deletions

diff --git a/epan/dissectors/packet-aruba-iap.c b/epan/dissectors/packet-aruba-iap.c
index 60f733fe..9be96b68 100644
--- a/epan/dissectors/packet-aruba-iap.c
+++ b/epan/dissectors/packet-aruba-iap.c
@@ -39,21 +39,21 @@ void proto_reg_handoff_aruba_iap(void);
 
 static dissector_handle_t iap_handle;
 
-static int proto_aruba_iap = -1;
-static gint ett_aruba_iap  = -1;
-
-static int hf_iap_magic = -1;
-static int hf_iap_version = -1;
-static int hf_iap_type = -1;
-static int hf_iap_length = -1;
-static int hf_iap_id = -1;
-static int hf_iap_status = -1;
-static int hf_iap_uptime = -1;
-static int hf_iap_vc_ip = -1;
-static int hf_iap_pvid = -1;
-static int hf_iap_model = -1;
-static int hf_iap_unknown_uint = -1;
-static int hf_iap_unknown_bytes = -1;
+static int proto_aruba_iap;
+static int ett_aruba_iap;
+
+static int hf_iap_magic;
+static int hf_iap_version;
+static int hf_iap_type;
+static int hf_iap_length;
+static int hf_iap_id;
+static int hf_iap_status;
+static int hf_iap_uptime;
+static int hf_iap_vc_ip;
+static int hf_iap_pvid;
+static int hf_iap_model;
+static int hf_iap_unknown_uint;
+static int hf_iap_unknown_bytes;
 
 static const value_string iap_model[] = {
     { 0x0a, "Orion (IAP-104, IAP-105, IAP-175, RAP-3WN and RAP-3WNP)" },
@@ -78,8 +78,8 @@ dissect_aruba_iap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 {
     proto_tree *ti;
     proto_tree *aruba_iap_tree;
-    guint16 magic;
-    guint8 type;
+    uint16_t magic;
+    uint8_t type;
     int offset = 0;
 
     magic = tvb_get_ntohs(tvb, offset);
@@ -100,10 +100,10 @@ dissect_aruba_iap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 
     proto_tree_add_item(aruba_iap_tree, hf_iap_version, tvb, offset, 1, ENC_BIG_ENDIAN);
     offset += 1;
-    col_add_fstr(pinfo->cinfo, COL_INFO, "Aruba Instant AP");
+    col_set_str(pinfo->cinfo, COL_INFO, "Aruba Instant AP");
 
     proto_tree_add_item(aruba_iap_tree, hf_iap_type, tvb, offset, 1, ENC_BIG_ENDIAN);
-    type = tvb_get_guint8(tvb, offset);
+    type = tvb_get_uint8(tvb, offset);
     offset += 1;
 
     proto_tree_add_item(aruba_iap_tree, hf_iap_length, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -197,7 +197,7 @@ proto_register_aruba_iap(void)
 
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_aruba_iap,
     };