Fix a few gcc _Wshadow warnings ....

svn path=/trunk/; revision=31580

11 files changed, 75 insertions, 69 deletions

diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index 8050cb9364..2813665e48 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -79,7 +79,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_tree	*qllc_tree = NULL;
     proto_item	*qllc_ti = NULL;
     gboolean	*q_bit_set = pinfo->private_data;
-    guint8	address, ctrl;
+    guint8	addr, ctrl;
     gboolean	command = FALSE;
 
     /*
@@ -101,7 +101,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* Get the address; we need it to determine if this is a
      * COMMAND or a RESPONSE */
-    address = tvb_get_guint8(tvb, 0);
+    addr = tvb_get_guint8(tvb, 0);
     if (tree) {
 	proto_tree_add_item(qllc_tree, hf_qllc_address, tvb, 0, 1, FALSE);
     }
@@ -109,7 +109,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     /* The address field equals X'FF' in commands (except QRR)
      * and anything in responses. */
     ctrl = tvb_get_guint8(tvb, 1);
-    if (ctrl != QRR && address == 0xff) {
+    if (ctrl != QRR && addr == 0xff) {
         command = TRUE;
     }
 
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index cbe47ea5a5..f35604aaa9 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -817,7 +817,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
     proto_tree *radiotap_tree = NULL;
     proto_tree *pt, *present_tree = NULL;
-    proto_tree *ft, *flags_tree = NULL;
+    proto_tree *ft;
     proto_item *ti = NULL, *hidden_item;
     int align_offset, offset;
     tvbuff_t *next_tvb;
@@ -938,13 +938,15 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	switch (bit) {
 	case IEEE80211_RADIOTAP_FLAGS:
+	{
+	    proto_tree *flags_tree;
 	    if (length_remaining < 1)
 		break;
 	    rflags = tvb_get_guint8(tvb, offset);
 	    if (tree) {
-        ft = proto_tree_add_item(radiotap_tree, hf_radiotap_flags,
-            tvb, offset, 1, FALSE);
-        flags_tree = proto_item_add_subtree(ft, ett_radiotap_flags);
+		ft = proto_tree_add_item(radiotap_tree, hf_radiotap_flags,
+					 tvb, offset, 1, FALSE);
+		flags_tree = proto_item_add_subtree(ft, ett_radiotap_flags);
 
 		proto_tree_add_item(flags_tree, hf_radiotap_flags_cfp,
 			tvb, offset, 1, FALSE);
@@ -966,7 +968,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	    offset++;
 	    length_remaining--;
 	    break;
-
+	}
 	case IEEE80211_RADIOTAP_RATE:
 	    if (length_remaining < 1)
 		break;
@@ -1117,7 +1119,8 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	    length_remaining-=4;
 	    break;
 	}
-	case IEEE80211_RADIOTAP_XCHANNEL: {
+	case IEEE80211_RADIOTAP_XCHANNEL:
+	{
 	    proto_item *it;
 	    proto_tree *flags_tree;
 
@@ -1243,6 +1246,8 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	    length_remaining-=2;
 	    break;
 	case IEEE80211_RADIOTAP_RX_FLAGS:
+	{
+	    proto_tree *flags_tree;
 	    if (radiotap_bit14_fcs) {
 	        align_offset = ALIGN_OFFSET(offset, 4);
 	        offset += align_offset;
@@ -1277,6 +1282,7 @@ dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 length_remaining-=2;
             }
 	    break;
+	}
 	default:
 	    /*
 	     * This indicates a field whose size we do not
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index 957e4401b5..b78a1f5e46 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -69,32 +69,32 @@ dissector_handle_t xml_handle;
 /* =========== */
 
 /* Set/Reset preferences to default values */
-static void alc_prefs_set_default(struct _alc_prefs *prefs)
+static void alc_prefs_set_default(struct _alc_prefs *alc_prefs)
 {
-	prefs->use_default_udp_port = FALSE;
-	prefs->default_udp_port = 4001;
+	alc_prefs->use_default_udp_port = FALSE;
+	alc_prefs->default_udp_port = 4001;
 	
-	lct_prefs_set_default(&prefs->lct);
-	fec_prefs_set_default(&prefs->fec);
+	lct_prefs_set_default(&alc_prefs->lct);
+	fec_prefs_set_default(&alc_prefs->fec);
 }
 
 /* Register preferences */
-static void alc_prefs_register(struct _alc_prefs *prefs, module_t *module)
+static void alc_prefs_register(struct _alc_prefs *alc_prefs, module_t *module)
 {
 	prefs_register_bool_preference(module,
 		"default.udp_port.enabled",
 		"Use default UDP port",
 		"Whether that payload of UDP packets with a specific destination port should be automatically dissected as ALC packets",
-		 &prefs->use_default_udp_port);
+		 &alc_prefs->use_default_udp_port);
 
  	prefs_register_uint_preference(module,
 		"default.udp_port",
 		"Default UDP destination port",
 		"Specifies the UDP destination port for automatic dissection of ALC packets",
-		 10, &prefs->default_udp_port);
+		 10, &alc_prefs->default_udp_port);
 		 
-	lct_prefs_register(&prefs->lct, module);
-	fec_prefs_register(&prefs->fec, module);
+	lct_prefs_register(&alc_prefs->lct, module);
+	fec_prefs_register(&alc_prefs->fec, module);
 }
 
 /* Save preferences to alc_prefs_old */
diff --git a/epan/dissectors/packet-rmt-fec.c b/epan/dissectors/packet-rmt-fec.c
index 0592bd6279..247740d896 100644
--- a/epan/dissectors/packet-rmt-fec.c
+++ b/epan/dissectors/packet-rmt-fec.c
@@ -264,13 +264,13 @@ void fec_dissector_free(struct _fec *fec _U_)
 /* ----------- */
 
 /* Set/Reset preferences to default values */
-void fec_prefs_set_default(struct _fec_prefs *prefs _U_)
+void fec_prefs_set_default(struct _fec_prefs *fec_prefs _U_)
 {
 
 }
 
 /* Register preferences */
-void fec_prefs_register(struct _fec_prefs *prefs _U_, module_t *module _U_)
+void fec_prefs_register(struct _fec_prefs *fec_prefs _U_, module_t *module _U_)
 {
 
 }
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index eea5d87d41..6b6b7f74bd 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -81,7 +81,7 @@ static void lct_timestamp_parse(guint32 t, nstime_t* s)
 	s->nsecs = (t % 1000) * 1000000;
 }
 
-gboolean lct_ext_decode(struct _ext *e, struct _lct_prefs *prefs, tvbuff_t *tvb, proto_tree *tree, gint ett, struct _fec_ptr f)
+gboolean lct_ext_decode(struct _ext *e, struct _lct_prefs *lct_prefs, tvbuff_t *tvb, proto_tree *tree, gint ett, struct _fec_ptr f)
 {
 	guint32 buffer32;
 	proto_item *ti;
@@ -158,7 +158,7 @@ gboolean lct_ext_decode(struct _ext *e, struct _lct_prefs *prefs, tvbuff_t *tvb,
 
 	/* EXT_FDT */
 	case 192:
-		switch (prefs->ext_192)
+		switch (lct_prefs->ext_192)
 		{
 		case LCT_PREFS_EXT_192_NONE:
 			rmt_ext_decode_default(e, tvb, tree, ett);
@@ -188,7 +188,7 @@ gboolean lct_ext_decode(struct _ext *e, struct _lct_prefs *prefs, tvbuff_t *tvb,
 
 	/* EXT_CENC */
 	case 193:
-		switch (prefs->ext_193)
+		switch (lct_prefs->ext_193)
 		{
 		case LCT_PREFS_EXT_193_NONE:
 			rmt_ext_decode_default(e, tvb, tree, ett);
@@ -486,27 +486,27 @@ void lct_dissector_free(struct _lct *lct)
 /* ----------- */
 
 /* Set/Reset preferences to default values */
-void lct_prefs_set_default(struct _lct_prefs *prefs)
+void lct_prefs_set_default(struct _lct_prefs *lct_prefs)
 {
-	prefs->codepoint_as_fec_encoding = TRUE;
-	prefs->ext_192 = LCT_PREFS_EXT_192_FLUTE;
-	prefs->ext_193 = LCT_PREFS_EXT_193_FLUTE;
+	lct_prefs->codepoint_as_fec_encoding = TRUE;
+	lct_prefs->ext_192 = LCT_PREFS_EXT_192_FLUTE;
+	lct_prefs->ext_193 = LCT_PREFS_EXT_193_FLUTE;
 }
 
 /* Register preferences */
-void lct_prefs_register(struct _lct_prefs *prefs, module_t *module)
+void lct_prefs_register(struct _lct_prefs *lct_prefs, module_t *module)
 {
  	prefs_register_bool_preference(module,
 		"lct.codepoint_as_fec_id",
 		"LCT Codepoint as FEC Encoding ID",
 		"Whether the LCT header Codepoint field should be considered the FEC Encoding ID of carried object",
-		 &prefs->codepoint_as_fec_encoding);
+		 &lct_prefs->codepoint_as_fec_encoding);
 
 	prefs_register_enum_preference(module,
 		"lct.ext.192",
 		"LCT header extension 192",
 		"How to decode LCT header extension 192",
-		&prefs->ext_192,
+		&lct_prefs->ext_192,
 		enum_lct_ext_192,
 		FALSE);
 
@@ -514,7 +514,7 @@ void lct_prefs_register(struct _lct_prefs *prefs, module_t *module)
 		"lct.ext.193",
 		"LCT header extension 193",
 		"How to decode LCT header extension 193",
-		&prefs->ext_193,
+		&lct_prefs->ext_193,
 		enum_lct_ext_193,
 		FALSE);
 }
diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c
index 5a3ec440dd..fe57242c1e 100644
--- a/epan/dissectors/packet-rmt-norm.c
+++ b/epan/dissectors/packet-rmt-norm.c
@@ -113,15 +113,15 @@ static struct _norm_prefs preferences;
 /* =========== */
 
 /* Set/Reset preferences to default values */
-static void norm_prefs_set_default(struct _norm_prefs *prefs)
+static void norm_prefs_set_default(struct _norm_prefs *norm_prefs)
 {
-	fec_prefs_set_default(&prefs->fec);
+	fec_prefs_set_default(&norm_prefs->fec);
 }
 
 /* Register preferences */
-static void norm_prefs_register(struct _norm_prefs *prefs, module_t *module)
+static void norm_prefs_register(struct _norm_prefs *norm_prefs, module_t *module)
 {
-	fec_prefs_register(&prefs->fec, module);
+	fec_prefs_register(&norm_prefs->fec, module);
 }
 
 /* Save preferences to alc_prefs_old */
@@ -139,10 +139,10 @@ static double UnquantizeRtt(unsigned char qrtt)
 		(RTT_MAX/exp(((double)(255-qrtt))/(double)13.0)));
 }
 
-static double UnquantizeGSize(guint8 gsize)
+static double UnquantizeGSize(guint8 gsizex)
 {
-	guint mant = (gsize & 0x8) ? 5 : 1;
-	guint exponent = gsize & 0x7;
+	guint mant = (gsizex & 0x8) ? 5 : 1;
+	guint exponent = gsizex & 0x7;
 	exponent ++;
 	return mant * pow(10, exponent);
 }
@@ -156,15 +156,15 @@ static double UnquantizeSendRate(guint16 send_rate)
 static guint dissect_grrtetc(proto_tree *tree, tvbuff_t *tvb, guint offset)
 {
 	guint8 backoff;
-	double gsize;
+	double gsizex;
 	double grtt;
 	proto_tree_add_item(tree, hf.instance_id, tvb, offset, 2, FALSE); offset+=2;
 	grtt = UnquantizeRtt(tvb_get_guint8(tvb, offset));
 	proto_tree_add_double(tree, hf.grtt, tvb, offset, 1, grtt); offset++;
 	backoff = hi_nibble(tvb_get_guint8(tvb, offset));
-	gsize = UnquantizeGSize((guint8)lo_nibble(tvb_get_guint8(tvb, offset)));
+	gsizex = UnquantizeGSize((guint8)lo_nibble(tvb_get_guint8(tvb, offset)));
 	proto_tree_add_uint(tree, hf.backoff, tvb, offset, 1, backoff);
-	proto_tree_add_double(tree, hf.gsize, tvb, offset, 1, gsize);
+	proto_tree_add_double(tree, hf.gsize, tvb, offset, 1, gsizex);
 	offset++;
 	return offset;
 }
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 43617d633d..e16309cf98 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -1723,7 +1723,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 	nstime_t ns;
 
 	dissect_function_t *dissect_function = NULL;
-	gboolean dissect_rpc = TRUE;
+	gboolean dissect_rpc_flag = TRUE;
 
 	rpc_conv_info_t *rpc_conv_info=NULL;
 
@@ -2381,7 +2381,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 				 * There's no protocol reply, so don't
 				 * try to dissect it.
 				 */
-				dissect_rpc = FALSE;
+				dissect_rpc_flag = FALSE;
 				break;
 
 			default:
@@ -2389,7 +2389,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 				 * There's no protocol reply, so don't
 				 * try to dissect it.
 				 */
-				dissect_rpc = FALSE;
+				dissect_rpc_flag = FALSE;
 				break;
 			}
 			break;
@@ -2429,7 +2429,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 			 * There's no protocol reply, so don't
 			 * try to dissect it.
 			 */
-			dissect_rpc = FALSE;
+			dissect_rpc_flag = FALSE;
 			break;
 
 		default:
@@ -2438,7 +2438,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 			 * no clue what's going on; don't try to dissect
 			 * the protocol reply.
 			 */
-			dissect_rpc = FALSE;
+			dissect_rpc_flag = FALSE;
 			break;
 		}
 		break; /* end of RPC reply */
@@ -2459,7 +2459,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 		proto_item_set_end(rpc_item, tvb, offset);
 	}
 
-	if (!dissect_rpc) {
+	if (!dissect_rpc_flag) {
 		/*
 		 * There's no RPC call or reply here; just dissect
 		 * whatever's left as data.
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 1432b8c2f5..8d20dec511 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -91,7 +91,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 {
     conversation_t			*conversation;
     struct rsync_conversation_data	*conversation_data;
-    struct rsync_frame_data		*frame_data;
+    struct rsync_frame_data		*rsync_frame_data_p;
     proto_item				*ti;
     proto_tree				*rsync_tree;
     int					offset = 0;
@@ -127,15 +127,15 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     rsync_tree = proto_item_add_subtree(ti, ett_rsync);
 
-    frame_data = p_get_proto_data(pinfo->fd, proto_rsync);
-    if (!frame_data) {
+    rsync_frame_data_p = p_get_proto_data(pinfo->fd, proto_rsync);
+    if (!rsync_frame_data_p) {
 	/* then we haven't seen this frame before */
-	frame_data = g_malloc(sizeof(struct rsync_frame_data));
-	frame_data->state = conversation_data->state;
-	p_add_proto_data(pinfo->fd, proto_rsync, frame_data);
+	rsync_frame_data_p = g_malloc(sizeof(struct rsync_frame_data));
+	rsync_frame_data_p->state = conversation_data->state;
+	p_add_proto_data(pinfo->fd, proto_rsync, rsync_frame_data_p);
     }
 
-    switch (frame_data->state) {
+    switch (rsync_frame_data_p->state) {
     case RSYNC_INIT:
 	proto_tree_add_item(rsync_tree, hf_rsync_hdr_magic, tvb, offset, 8, TRUE);
 	offset += 8;
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index 3b07ce7cc6..c2f6962b8f 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -827,7 +827,7 @@ dissect_s5066_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gint source
 {
         proto_item *ti = NULL;
         proto_tree *s5066_tree_address = NULL;
-	guint32 address;
+	guint32 addr;
 
         if (source) {
 		ti = proto_tree_add_text(tree, tvb, offset, 4, "Source Address");
@@ -838,9 +838,9 @@ dissect_s5066_address(tvbuff_t *tvb, guint offset, proto_tree *tree, gint source
         s5066_tree_address = proto_item_add_subtree(ti, ett_s5066_address);
 	proto_tree_add_item(s5066_tree_address, hf_s5066_ad_size, tvb, offset, 1, FALSE);
 	proto_tree_add_item(s5066_tree_address, hf_s5066_ad_group, tvb, offset, 1, FALSE);
-	address = tvb_get_ntohl(tvb, offset);
-	address = address & 0x1FFFFFFF;
-	proto_tree_add_ipv4(s5066_tree_address, hf_s5066_ad_address, tvb, offset, 4, g_htonl(address));
+	addr = tvb_get_ntohl(tvb, offset);
+	addr = addr & 0x1FFFFFFF;
+	proto_tree_add_ipv4(s5066_tree_address, hf_s5066_ad_address, tvb, offset, 4, g_htonl(addr));
 
 	return offset + 4;
 }
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index 886dec36ab..a7f60ec874 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -74,7 +74,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	proto_tree	*sdlc_tree;
 	proto_item	*sdlc_ti;
-	guint8		address;
+	guint8		addr;
 	guint16		control;
 	int		sdlc_header_len;
 	gboolean	is_response;
@@ -83,7 +83,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDLC");
 	col_clear(pinfo->cinfo, COL_INFO);
 
-	address = tvb_get_guint8(tvb, 0);
+	addr = tvb_get_guint8(tvb, 0);
 	sdlc_header_len = 1;	/* address */
 
 	/*
@@ -109,7 +109,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		sdlc_tree = proto_item_add_subtree(sdlc_ti, ett_sdlc);
 
 		proto_tree_add_uint(sdlc_tree, hf_sdlc_address, tvb, 0, 1,
-		    address);
+		    addr);
 	} else {
 		sdlc_ti = NULL;
 		sdlc_tree = NULL;
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index a72062a6f6..a0a6fab3e2 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -432,10 +432,10 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
 		}
 		if (tree)
 		{
-			guint8       flags;
+			guint8       flags8;
 
-			flags = tvb_get_guint8(tvb, offset);
-			if(flags & transport_connection_is_released )
+			flags8 = tvb_get_guint8(tvb, offset);
+			if(flags8 & transport_connection_is_released )
 			{
 				proto_tree_add_text(param_tree, tvb, offset, 1,
 				    "transport connection is released");
@@ -446,7 +446,7 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
 				    "transport connection is kept");
 			}
 
-			if(flags & user_abort )
+			if(flags8 & user_abort )
 			{
 				proto_tree_add_text(param_tree, tvb, offset, 1,
 				    "user abort");
@@ -457,19 +457,19 @@ dissect_parameter(tvbuff_t *tvb, int offset, proto_tree *tree,
 				session->abort_type = SESSION_PROVIDER_ABORT;
 			}
 
-			if(flags & protocol_error )
+			if(flags8 & protocol_error )
 			{
 				proto_tree_add_text(param_tree, tvb, offset, 1,
 				    "protocol error");
 			}
 
-			if(flags & no_reason )
+			if(flags8 & no_reason )
 			{
 				proto_tree_add_text(param_tree, tvb, offset, 1,
 				    "no reason");
 			}
 
-			if(flags & implementation_restriction )
+			if(flags8 & implementation_restriction )
 			{
 				proto_tree_add_text(param_tree, tvb, offset, 1,
 				    "implementation restriction");