diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-16 17:19:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-16 17:19:59 +0000 |
| commit | 1701f42969d28ef428f6e8f88b44f6b5bc949593 (patch) | |
| tree | a88e112701932ddac7cc5799c8acfac3dc0cbbdc /epan/dissectors/packet-wsp.c | |
| parent | 4515b2b3aae5fecd52548006b84f0746325b0cb5 (diff) | |
Fix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality).
Move code from ipv6-utils.h to packet-ipv6.c since that was the only
place it was used. Comment out unused code.
svn path=/trunk/; revision=52645
Diffstat (limited to 'epan/dissectors/packet-wsp.c')
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index b66baa9269..419ff7663e 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -3008,7 +3008,7 @@ wkh_ ## underscored(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i if (val_id <= 4) { /* Length field already parsed by macro! */ \ get_long_integer(val, tvb, off, len, ok); \ if (ok) { \ - val = val; /* hack to prevent 'set but not used' gcc warning */ \ + val = 0; /* hack to prevent 'set but not used' gcc warning */ \ tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start); \ ti = proto_tree_add_string(tree, hf_hdr_ ## underscored, \ tvb, hdr_start, offset - hdr_start, \ @@ -3330,7 +3330,7 @@ wkh_ ## underscored(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_i if (val_id <= 4) { /* Length field already parsed by macro! */ \ get_long_integer(val, tvb, off, len, ok); \ if (ok) { \ - val = val; /* hack to prevent 'set but not used' gcc warning */ \ + val = 0; /* hack to prevent 'set but not used' gcc warning */ \ val_str = try_val_to_str_ext(val_id & 0x7F, valueStringExtAddr); \ if (val_str) { \ tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start); \ |