summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2015-02-04 09:52:54 +0100
committerAnders Broman <a.broman58@gmail.com>2015-02-04 08:57:12 +0000
commit94011c1d937d40be94ec3c5f3814f90d883ab338 (patch)
tree6588fc395ba08b2a6b6dc28da8064fdd685512c2
parent9f78bf6e7e6af04c9f59c188a4a0812154706ebd (diff)
downloadwireshark-94011c1d937d40be94ec3c5f3814f90d883ab338.tar.gz
[QNET6] Try to fix solaris buildboot.
/Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index' was declared here /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_off' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_off' was declared here /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: warning: 'sstree' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: note: 'sstree' was declared here /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_len' may be used uninitialized in this function /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_len' was declared here Remove not needed includes. Change-Id: Iac91954b3d6c8f9799c6fe816af93376419d1b21 Reviewed-on: https://code.wireshark.org/review/6945 Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rwxr-xr-xepan/dissectors/packet-qnet6.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-qnet6.c b/epan/dissectors/packet-qnet6.c
index 7466934d53..a89638dee6 100755
--- a/epan/dissectors/packet-qnet6.c
+++ b/epan/dissectors/packet-qnet6.c
@@ -22,12 +22,6 @@
#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
#include <epan/packet.h>
#include <epan/prefs.h>
@@ -1497,9 +1491,9 @@ dissect_qnet6_lr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint *
{
#define PAIRS 6
proto_item *ti;
- proto_tree *stree, *srctree, *dstree, *sstree;
+ proto_tree *stree, *srctree, *dstree, *sstree = NULL;
guint32 total_len, off, len, rlen;
- gint lr_start, i, hf_index_off, hf_index_len, hf_index;
+ gint lr_start, i, hf_index_off = -1, hf_index_len = -1, hf_index = -1;
guint8 type;
guint8 const *p, *name[PAIRS];