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-q2931.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-q2931.c')
| -rw-r--r-- | epan/dissectors/packet-q2931.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 382fbcf5e4..76876dbf20 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -2035,8 +2035,10 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 info_element; guint8 info_element_ext; guint16 info_element_len; +#if 0 int codeset; gboolean non_locking_shift; +#endif col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.2931"); @@ -2094,8 +2096,10 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * And now for the information elements.... */ +#if 0 codeset = 0; /* start out in codeset 0 */ non_locking_shift = TRUE; +#endif while (tvb_reported_length_remaining(tvb, offset) > 0) { info_element = tvb_get_guint8(tvb, offset); info_element_ext = tvb_get_guint8(tvb, offset + 1); @@ -2104,9 +2108,9 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_q2931_ie(tvb, offset, info_element_len, q2931_tree, info_element, info_element_ext); } +#if 0 /* XXX: Is codeset & etc supoosed to be used somehow ? */ if (non_locking_shift) codeset = 0; - /* * Handle shifts. */ @@ -2126,6 +2130,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } break; } +#endif offset += 1 + 1 + 2 + info_element_len; } } |