1 files changed, 40 insertions, 40 deletions

diff --git a/epan/dissectors/packet-sdh.c b/epan/dissectors/packet-sdh.c
index f060d8c5..594b985e 100644
--- a/epan/dissectors/packet-sdh.c
+++ b/epan/dissectors/packet-sdh.c
@@ -23,42 +23,42 @@
 void proto_register_sdh(void);
 void proto_reg_handoff_sdh(void);
 
-static int proto_sdh = -1;
-
-static gint ett_sdh = -1;
-
-static int hf_sdh_a1 = -1;
-static int hf_sdh_a2 = -1;
-static int hf_sdh_j0 = -1;
-static int hf_sdh_b1 = -1;
-static int hf_sdh_e1 = -1;
-static int hf_sdh_f1 = -1;
-static int hf_sdh_d1 = -1;
-static int hf_sdh_d2 = -1;
-static int hf_sdh_d3 = -1;
-static int hf_sdh_au = -1;
-static int hf_sdh_b2 = -1;
-static int hf_sdh_k1 = -1;
-static int hf_sdh_k2 = -1;
-static int hf_sdh_d4 = -1;
-static int hf_sdh_d5 = -1;
-static int hf_sdh_d6 = -1;
-static int hf_sdh_d7 = -1;
-static int hf_sdh_d8 = -1;
-static int hf_sdh_d9 = -1;
-static int hf_sdh_d10 = -1;
-static int hf_sdh_d11 = -1;
-static int hf_sdh_d12 = -1;
-static int hf_sdh_s1 = -1;
-static int hf_sdh_m1 = -1;
-static int hf_sdh_e2 = -1;
-static int hf_sdh_h1 = -1;
-static int hf_sdh_h2 = -1;
-static int hf_sdh_j1 = -1;
+static int proto_sdh;
+
+static int ett_sdh;
+
+static int hf_sdh_a1;
+static int hf_sdh_a2;
+static int hf_sdh_j0;
+static int hf_sdh_b1;
+static int hf_sdh_e1;
+static int hf_sdh_f1;
+static int hf_sdh_d1;
+static int hf_sdh_d2;
+static int hf_sdh_d3;
+static int hf_sdh_au;
+static int hf_sdh_b2;
+static int hf_sdh_k1;
+static int hf_sdh_k2;
+static int hf_sdh_d4;
+static int hf_sdh_d5;
+static int hf_sdh_d6;
+static int hf_sdh_d7;
+static int hf_sdh_d8;
+static int hf_sdh_d9;
+static int hf_sdh_d10;
+static int hf_sdh_d11;
+static int hf_sdh_d12;
+static int hf_sdh_s1;
+static int hf_sdh_m1;
+static int hf_sdh_e2;
+static int hf_sdh_h1;
+static int hf_sdh_h2;
+static int hf_sdh_j1;
 
 static dissector_handle_t sdh_handle;
 
-static gint sdh_data_rate = 1;
+static int sdh_data_rate = 1;
 
 static const enum_val_t data_rates[] = {
   {"Attempt to guess", "Attempt to guess", -1},
@@ -92,7 +92,7 @@ static const value_string sdh_s1_vals[] = {
 static int
 get_sdh_level(tvbuff_t *tvb, packet_info *pinfo)
 {
-  guint64 *hdr = NULL;
+  uint64_t *hdr = NULL;
 
   /*data rate has been set in the SDH options*/
   if(sdh_data_rate != -1) return sdh_data_rate;
@@ -140,16 +140,16 @@ dissect_sdh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 
     int     level = get_sdh_level(tvb, pinfo);
 
-    guint8  h1;
-    guint8  h2;
-    guint16 au;
+    uint8_t h1;
+    uint8_t h2;
+    uint16_t au;
     int auoffset;
 
     sdh_item = proto_tree_add_protocol_format(tree, proto_sdh, tvb, 0, -1, "SDH");
     sdh_tree = proto_item_add_subtree(sdh_item, ett_sdh);
 
-    h1  = tvb_get_guint8(tvb, 0*level+(3*level*COLUMNS));
-    h2  = tvb_get_guint8(tvb, 3*level+(3*level*COLUMNS));
+    h1  = tvb_get_uint8(tvb, 0*level+(3*level*COLUMNS));
+    h2  = tvb_get_uint8(tvb, 3*level+(3*level*COLUMNS));
     au  = (h2 | ((0x03 & h1) << 8));
 
     proto_tree_add_item(sdh_tree, hf_sdh_a1, tvb, 0*level, 3*level, ENC_NA);
@@ -250,7 +250,7 @@ proto_register_sdh(void)
     { "H2", "sdh.h2", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
   };
-  static gint *ett[] = {
+  static int *ett[] = {
     &ett_sdh,
   };