diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-06-22 23:03:56 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-06-22 23:03:56 +0000 |
| commit | fb54240c344c9e1db6f190c281275485e6e5633c (patch) | |
| tree | 0979ee3d70dfd8f36b9a10e2d51bbe72b7be2111 /epan/dissectors/packet-infiniband.c | |
| parent | d201977d9c29e3921973542b7c59d2142d1bdcc1 (diff) | |
Fix some gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: misc minor cleanup: unneeded #include; whitespace, tvb_length-->tvb_reported_length
svn path=/trunk/; revision=37757
Diffstat (limited to 'epan/dissectors/packet-infiniband.c')
| -rw-r--r-- | epan/dissectors/packet-infiniband.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 75dd567d55..cd20ea4409 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1612,11 +1612,10 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g gint offset = 0; /* Current Offset */ /* General Variables */ - gboolean bthFollows = 0; /* Tracks if we are parsing a BTH. This is a significant decision point */ + gboolean bthFollows = FALSE; /* Tracks if we are parsing a BTH. This is a significant decision point */ guint8 virtualLane = 0; /* IB VirtualLane. Keyed off of for detecting subnet admin/management */ guint8 opCode = 0; /* OpCode from BTH header. */ gint32 nextHeaderSequence = -1; /* defined by this dissector. #define which indicates the upcoming header sequence from OpCode */ - guint16 payloadLength = 0; /* Payload Length should it exist */ guint8 nxtHdr = 0; /* Keyed off for header dissection order */ guint16 packetLength = 0; /* Packet Length. We track this as tvb_length - offset. */ /* It provides the parsing methods a known size */ @@ -1744,8 +1743,6 @@ skip_lrh: proto_tree_add_item(global_route_header_tree, hf_infiniband_traffic_class, tvb, offset, 2, FALSE); proto_tree_add_item(global_route_header_tree, hf_infiniband_flow_label, tvb, offset, 4, FALSE); offset += 4; - payloadLength = tvb_get_ntohs(tvb, offset); - proto_tree_add_item(global_route_header_tree, hf_infiniband_payload_length, tvb, offset, 2, FALSE); offset += 2; nxtHdr = tvb_get_guint8(tvb, offset); @@ -4949,7 +4946,7 @@ static void parse_PERF_PortCountersExtended(proto_tree* parentTree, tvbuff_t* tv static void dissect_general_info(tvbuff_t *tvb, gint offset, packet_info *pinfo, gboolean starts_with_grh) { guint8 lnh_val = 0; /* The Link Next Header Value. Tells us which headers are coming */ - gboolean bthFollows = 0; /* Tracks if we are parsing a BTH. This is a significant decision point */ + gboolean bthFollows = FALSE; /* Tracks if we are parsing a BTH. This is a significant decision point */ guint8 virtualLane = 0; /* The Virtual Lane of the current Packet */ guint8 opCode = 0; /* OpCode from BTH header. */ gint32 nextHeaderSequence = -1; /* defined by this dissector. #define which indicates the upcoming header sequence from OpCode */ |