1 files changed, 13 insertions, 13 deletions

diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index 164aca37..3ab88c1f 100644
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -29,15 +29,15 @@ void proto_register_user_encap(void);
 void proto_reg_handoff_user_encap(void);
 
 typedef struct _user_encap_t {
-    guint encap;
+    unsigned encap;
     char* payload_proto_name;
     dissector_handle_t payload_proto;
     char* header_proto_name;
     dissector_handle_t header_proto;
     char* trailer_proto_name;
     dissector_handle_t trailer_proto;
-    guint header_size;
-    guint trailer_size;
+    unsigned header_size;
+    unsigned trailer_size;
 } user_encap_t;
 
 #define ENCAP0_STR "User 0 (DLT=147)"
@@ -60,15 +60,15 @@ static const value_string user_dlts[] = {
     { WTAP_ENCAP_USER15, "User 15 (DLT=162)"},
     { 0, NULL }
 };
-static int proto_user_encap = -1;
+static int proto_user_encap;
 
-static expert_field ei_user_encap_not_handled = EI_INIT;
+static expert_field ei_user_encap_not_handled;
 
-static user_encap_t* encaps = NULL;
-static guint num_encaps = 0;
+static user_encap_t* encaps;
+static unsigned num_encaps;
 static uat_t* encaps_uat;
 
-static gint exported_pdu_tap = -1;
+static int exported_pdu_tap = -1;
 
 static dissector_handle_t user_encap_handle;
 
@@ -98,8 +98,8 @@ static int dissect_user(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, voi
     user_encap_t* encap = NULL;
     tvbuff_t* payload_tvb;
     proto_item* item;
-    gint len, reported_len;
-    guint i;
+    int len, reported_len;
+    unsigned i;
 
     for (i = 0; i < num_encaps; i++) {
         if (encaps[i].encap == pinfo->match_uint) {
@@ -209,7 +209,7 @@ static void user_free_cb(void* record)
     g_free(u->trailer_proto_name);
 }
 
-UAT_VS_DEF(user_encap, encap, user_encap_t, guint, WTAP_ENCAP_USER0, ENCAP0_STR)
+UAT_VS_DEF(user_encap, encap, user_encap_t, unsigned, WTAP_ENCAP_USER0, ENCAP0_STR)
 UAT_DISSECTOR_DEF(user_encap, payload_proto, payload_proto, payload_proto_name, user_encap_t)
 UAT_DEC_CB_DEF(user_encap, header_size, user_encap_t)
 UAT_DISSECTOR_DEF(user_encap, header_proto, header_proto, header_proto_name, user_encap_t)
@@ -218,7 +218,7 @@ UAT_DISSECTOR_DEF(user_encap, trailer_proto, trailer_proto, trailer_proto_name,
 
 void proto_reg_handoff_user_encap(void)
 {
-    guint i;
+    unsigned i;
 
     user2_encap.payload_proto = find_dissector("pktap");
 
@@ -260,7 +260,7 @@ void proto_register_user_encap(void)
     encaps_uat = uat_new("User DLTs Table",
                          sizeof(user_encap_t),
                          "user_dlts",
-                         TRUE,
+                         true,
                          &encaps,
                          &num_encaps,
                          UAT_AFFECTS_DISSECTION, /* affects dissection of packets, but not set of named fields */