Adding upstream version 4.4.0.upstream/4.4.0upstream

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

1 files changed, 33 insertions, 33 deletions

diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c
index 9c33eca6..e54d179d 100644
--- a/epan/dissectors/packet-logcat.c
+++ b/epan/dissectors/packet-logcat.c
@@ -19,34 +19,34 @@
 #include <epan/prefs.h>
 #include <wiretap/wtap.h>
 
-static int proto_logcat = -1;
-
-static int hf_logcat_version = -1;
-static int hf_logcat_length = -1;
-static int hf_logcat_padding = -1;
-static int hf_logcat_header_size = -1;
-static int hf_logcat_pid = -1;
-static int hf_logcat_tid = -1;
-static int hf_logcat_timestamp = -1;
-static int hf_logcat_timestamp_seconds = -1;
-static int hf_logcat_timestamp_nanoseconds = -1;
-static int hf_logcat_euid = -1;
-static int hf_logcat_priority = -1;
-static int hf_logcat_tag = -1;
-static int hf_logcat_log = -1;
-
-static gint ett_logcat = -1;
-static gint ett_logcat_timestamp = -1;
-static gint ett_logcat_log = -1;
+static int proto_logcat;
+
+static int hf_logcat_version;
+static int hf_logcat_length;
+static int hf_logcat_padding;
+static int hf_logcat_header_size;
+static int hf_logcat_pid;
+static int hf_logcat_tid;
+static int hf_logcat_timestamp;
+static int hf_logcat_timestamp_seconds;
+static int hf_logcat_timestamp_nanoseconds;
+static int hf_logcat_euid;
+static int hf_logcat_priority;
+static int hf_logcat_tag;
+static int hf_logcat_log;
+
+static int ett_logcat;
+static int ett_logcat_timestamp;
+static int ett_logcat_log;
 
 static dissector_handle_t logcat_handle;
 static dissector_handle_t data_text_lines_handle;
 
-static gint exported_pdu_tap = -1;
+static int exported_pdu_tap = -1;
 
-static expert_field ei_invalid_payload_length = EI_INIT;
+static expert_field ei_invalid_payload_length;
 
-static gboolean  pref_one_line_info_column = TRUE;
+static bool  pref_one_line_info_column = true;
 
 const value_string priority_vals[] = {
     { 0x00,  "Unknown" },
@@ -64,9 +64,9 @@ const value_string priority_vals[] = {
 void proto_register_logcat(void);
 void proto_reg_handoff_logcat(void);
 
-static gint detect_version(tvbuff_t *tvb, gint offset) {
-    guint16         payload_length;
-    guint16         try_header_size;
+static int detect_version(tvbuff_t *tvb, int offset) {
+    uint16_t        payload_length;
+    uint16_t        try_header_size;
 
     payload_length  = tvb_get_letohs(tvb, offset);
     try_header_size = tvb_get_letohs(tvb, offset + 2);
@@ -83,17 +83,17 @@ static gint detect_version(tvbuff_t *tvb, gint offset) {
 static int
 dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-    gint         offset = 0;
+    int          offset = 0;
     proto_tree  *maintree;
     proto_item  *mainitem;
     proto_tree  *subtree;
     proto_item  *subitem;
-    guint16      length;
-    guint16      check_length;
-    guint32      string_length;
-    gint         logger_version;
-    guint8      *log;
-    gchar       *c;
+    uint16_t     length;
+    uint16_t     check_length;
+    uint32_t     string_length;
+    int          logger_version;
+    uint8_t     *log;
+    char        *c;
     tvbuff_t    *next_tvb;
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Logcat");
@@ -262,7 +262,7 @@ proto_register_logcat(void)
         }
     };
 
-    static gint *ett[] = {
+    static int *ett[] = {
         &ett_logcat,
         &ett_logcat_timestamp,
         &ett_logcat_log