aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-lldp.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-05-13 09:27:44 +0200
committerAnders Broman <a.broman58@gmail.com>2014-05-13 08:45:51 +0000
commitc32fb055cafed7abb8c452fe48fc5969a90e9c2d (patch)
treee4f84da1657b34a180009dad70fac41507b29369 /epan/dissectors/packet-lldp.c
parentfb1e25172373ded49891154946de6cae2d22ae83 (diff)
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ieac2f4a288f6ed084f2ea83ad409e217168065b2 Reviewed-on: https://code.wireshark.org/review/1621 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-lldp.c')
-rw-r--r--epan/dissectors/packet-lldp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index 8541d4e64d..96cb9f266a 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -1429,7 +1429,7 @@ dissect_lldp_management_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
/* Get OID identifier */
proto_tree_add_item(system_mgm_addr, hf_mgn_obj_id, tvb, tempOffset, stringLen, ENC_NA);
- tempOffset += stringLen;
+ /*tempOffset += stringLen;*/
}
}
@@ -1646,7 +1646,7 @@ dissect_dcbx_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint3
}
/* Dissect IEEE 802.1 TLVs */
-static void
+static int
dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset)
{
guint8 subType;
@@ -1995,7 +1995,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
tempShort = tvb_get_ntohs(tvb, tempOffset + 1);
tf = proto_tree_add_text(tree, tvb, tempOffset, 3, "%s Application",
- val_to_str_const(tempShort, dcbx_app_types, "Unknown"));
+ val_to_str_const(tempShort, dcbx_app_types, "Unknown"));
apptlv_tree = proto_item_add_subtree(tf, ett_org_spc_ieee_dcbx_app);
proto_tree_add_item(apptlv_tree, hf_ieee_8021az_app_prio, tvb, tempOffset, 1, ENC_BIG_ENDIAN);
@@ -2012,7 +2012,7 @@ dissect_ieee_802_1_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
}
}
- return;
+ return tempOffset;
}
/* Dissect IEEE 802.1Qbg TLVs */