diff options
| author | Evan Huus <eapache@gmail.com> | 2013-08-16 01:35:56 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-08-16 01:35:56 +0000 |
| commit | 6538787c92075f207749da7a3c8a566ec703d0ea (patch) | |
| tree | 808d1611d7dccec2c8eaee2c6a6b796057d026d2 | |
| parent | e2bf819eaf0e9dd734dba65209e102fcc1ee272f (diff) | |
Add one 'volatile' keyword to fix a -Wclobbered and change the tree used in one
proto_tree call to fix a -Wunused-but-set-variable, both of which show up in GCC
4.8.
svn path=/trunk/; revision=51386
| -rw-r--r-- | epan/dissectors/packet-sflow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 1038092ba0..62b5994b90 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -652,7 +652,7 @@ static gint dissect_sflow_245_sampled_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, volatile gint offset) { guint32 version, header_proto, frame_length; - guint32 header_length; + volatile guint32 header_length; tvbuff_t *next_tvb; proto_tree *sflow_245_header_tree; proto_item *ti; @@ -923,7 +923,7 @@ dissect_sflow_5_extended_mpls_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree * 255 is a sensible limit of label count */ for (i = 0, j = 0; i < (out_label_count & 0x000000ff); i++, j += 4) { label = tvb_get_ntohl(tvb, offset + j); - proto_tree_add_uint_format(in_stack, hf_sflow_245_extended_mpls_out_label, tvb, offset, 4, + proto_tree_add_uint_format(out_stack, hf_sflow_245_extended_mpls_out_label, tvb, offset, 4, label, "Label %u: %u", i + 1, label); } offset = offset + out_label_count * 4; |