aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-amqp.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-11-20 12:43:04 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-11-20 12:43:04 +0000
commit62866c78a006cb680358cda2d40d2140cfb0b97d (patch)
treee35b0a570aceccc6f2c60e9ab90574475e6eedee /epan/dissectors/packet-amqp.c
parent8fdb6af097162f3fdb41a1db045c40dc1fb61f03 (diff)
Get rid of Warnings.
svn path=/trunk/; revision=39957
Diffstat (limited to 'epan/dissectors/packet-amqp.c')
-rw-r--r--epan/dissectors/packet-amqp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index c4885f1ef4..d6e00d17d1 100644
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -2967,7 +2967,7 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
proto_item *args_tree;
proto_item *ti;
proto_item *flags_item;
- guint8 class = 0, method;
+ guint8 amqp_class = 0, method;
guint8 flag1, flag2;
guint16 size;
guint32 struct_size;
@@ -3060,14 +3060,14 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
}
if (flag1 & 0x04) {
/* class-code (uint8) */
- class = tvb_get_guint8(tvb, offset);
+ amqp_class = tvb_get_guint8(tvb, offset);
proto_tree_add_item(args_tree, hf_amqp_0_10_class,
tvb, offset, 1, ENC_BIG_ENDIAN);
AMQP_INCREMENT(offset, 1, length);
}
if (flag1 & 0x08) {
/* command-code (uint8) */
- switch(class) {
+ switch(amqp_class) {
case AMQP_0_10_CLASS_CONNECTION:
class_hf = hf_amqp_0_10_connection_method;
break;
@@ -3107,7 +3107,7 @@ dissect_amqp_0_10_execution(tvbuff_t *tvb,
tvb, offset, 1, ENC_BIG_ENDIAN);
else
expert_add_info_format(pinfo, args_tree, PI_PROTOCOL, PI_WARN,
- "Invalid class code %x", class);
+ "Invalid class code %x", amqp_class);
AMQP_INCREMENT(offset, 1, length);
}
if (flag1 & 0x10) {