aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2014-06-26 14:52:58 +0200
committerAnders Broman <a.broman58@gmail.com>2014-06-26 13:08:59 +0000
commit7c1b5e9b7eea8012cef3a5d9525bb880103c7b20 (patch)
treec1830d74e7db0993756ad77854978be1a2306c6c /epan
parentf7987091bab94f2403024c34702e9d5007a5d790 (diff)
Fix several compilation warnings
Followup of gf798709 Change-Id: I0afddfe2e9b9ac454377f2358a29b4ecdd011b91 Reviewed-on: https://code.wireshark.org/review/2668 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-fcswils.c1
-rw-r--r--epan/dissectors/packet-ff.c2
-rw-r--r--epan/dissectors/packet-flip.c4
3 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 168928c531..3e6429d4d2 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -615,7 +615,6 @@ dissect_swils_ess_capability_obj(tvbuff_t *tvb, proto_tree *tree, int offset)
{
int i = 0, num_entries = 0, len = 0, total_len = 0;
guint8 type, subtype, srvr_type;
- proto_item *ti = NULL;
proto_tree *capinfo_tree = NULL;
if (tree) {
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index 113e20b165..c3ccad329e 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -4538,6 +4538,8 @@ dissect_ff_msg_fms_put_od_rsp(tvbuff_t *tvb, gint offset,
if (length) {
sub_tree = proto_tree_add_subtree(tree, tvb, offset, length,
ett_ff_fms_put_od_rsp, NULL, "FMS Put OD Response");
+ proto_tree_add_text(sub_tree, tvb, offset, length,
+ "[Unknown] (%u bytes)", length);
}
return;
diff --git a/epan/dissectors/packet-flip.c b/epan/dissectors/packet-flip.c
index cca021ecd0..75bf492f37 100644
--- a/epan/dissectors/packet-flip.c
+++ b/epan/dissectors/packet-flip.c
@@ -149,7 +149,6 @@ dissect_flip_chksum_hdr(tvbuff_t *tvb,
guint16 computed_chksum,
gboolean *ext_hdr_follows_ptr)
{
- proto_item *item;
proto_tree *chksum_hdr_tree;
guint32 dw;
guint8 chksum_hdr_etype;
@@ -160,7 +159,6 @@ dissect_flip_chksum_hdr(tvbuff_t *tvb,
gint bytes_dissected;
gint offset;
- item = NULL;
chksum_hdr_tree = NULL;
bytes_dissected = 0;
@@ -338,7 +336,6 @@ is_payload_rtcp(tvbuff_t *tvb)
static int
dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
- proto_item *item;
proto_item *ti;
proto_tree *flip_tree;
proto_tree *basic_hdr_tree;
@@ -365,7 +362,6 @@ dissect_flip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* Error handling for basic header. */
gboolean is_faulty_frame;
- item = NULL;
ti = NULL;
flip_tree = NULL;
basic_hdr_tree = NULL;