1 files changed, 35 insertions, 36 deletions

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index c45c6651c0..4e4f2acee1 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -13,7 +13,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <wsutil/pint.h>
 #include <epan/oui.h>
 #include <epan/xdlc.h>
@@ -38,40 +37,40 @@ void proto_reg_handoff_llc(void);
 
 #define UDP_PORT_LLC_RANGE   "12000-12004"
 
-static int proto_llc = -1;
-static int hf_llc_dsap = -1;
-static int hf_llc_ssap = -1;
-static int hf_llc_dsap_sap = -1;
-static int hf_llc_dsap_ig = -1;
-static int hf_llc_ssap_sap = -1;
-static int hf_llc_ssap_cr = -1;
-static int hf_llc_ctrl = -1;
-static int hf_llc_n_r = -1;
-static int hf_llc_n_s = -1;
-static int hf_llc_p = -1;
-static int hf_llc_p_ext = -1;
-static int hf_llc_f = -1;
-static int hf_llc_f_ext = -1;
-static int hf_llc_s_ftype = -1;
-static int hf_llc_u_modifier_cmd = -1;
-static int hf_llc_u_modifier_resp = -1;
-static int hf_llc_ftype_i = -1;
-static int hf_llc_ftype_s_u = -1;
-static int hf_llc_ftype_s_u_ext = -1;
-static int hf_llc_type = -1;
-static int hf_llc_oui = -1;
-static int hf_llc_pid = -1;
-
-static int proto_basicxid = -1;
-static int hf_llc_xid_format = -1;
-static int hf_llc_xid_types = -1;
-static int hf_llc_xid_wsize = -1;
-
-static gint ett_llc = -1;
-static gint ett_llc_dsap = -1;
-static gint ett_llc_ssap = -1;
-static gint ett_llc_ctrl = -1;
-static gint ett_llc_basicxid = -1;
+static int proto_llc;
+static int hf_llc_dsap;
+static int hf_llc_ssap;
+static int hf_llc_dsap_sap;
+static int hf_llc_dsap_ig;
+static int hf_llc_ssap_sap;
+static int hf_llc_ssap_cr;
+static int hf_llc_ctrl;
+static int hf_llc_n_r;
+static int hf_llc_n_s;
+static int hf_llc_p;
+static int hf_llc_p_ext;
+static int hf_llc_f;
+static int hf_llc_f_ext;
+static int hf_llc_s_ftype;
+static int hf_llc_u_modifier_cmd;
+static int hf_llc_u_modifier_resp;
+static int hf_llc_ftype_i;
+static int hf_llc_ftype_s_u;
+static int hf_llc_ftype_s_u_ext;
+static int hf_llc_type;
+static int hf_llc_oui;
+static int hf_llc_pid;
+
+static int proto_basicxid;
+static int hf_llc_xid_format;
+static int hf_llc_xid_types;
+static int hf_llc_xid_wsize;
+
+static gint ett_llc;
+static gint ett_llc_dsap;
+static gint ett_llc_ssap;
+static gint ett_llc_ctrl;
+static gint ett_llc_basicxid;
 
 static dissector_table_t dsap_subdissector_table;
 static dissector_table_t xid_subdissector_table;
@@ -210,7 +209,7 @@ static wmem_map_t *oui_info_table = NULL;
 static void
 llc_sap_value( gchar *result, guint32 sap )
 {
-	g_snprintf( result, ITEM_LABEL_LENGTH, "%s", val_to_str_const(sap<<1, sap_vals, "Unknown"));
+	snprintf( result, ITEM_LABEL_LENGTH, "%s", val_to_str_const(sap<<1, sap_vals, "Unknown"));
 }
 
 /*