aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_bssmap_le.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-01-18 21:49:47 +0000
committerBill Meier <wmeier@newsguy.com>2010-01-18 21:49:47 +0000
commitde4c6ff5157aeec5f1e03f514a71f8530666ed21 (patch)
treec50b56a45e65cddff9bc5e5c6a89f6e1ce51d25f /epan/dissectors/packet-gsm_bssmap_le.c
parent55669f7127c94adcaeb5deae956f97913bd3cdeb (diff)
Fix a number of gcc _Wshadow warnings
svn path=/trunk/; revision=31557
Diffstat (limited to 'epan/dissectors/packet-gsm_bssmap_le.c')
-rw-r--r--epan/dissectors/packet-gsm_bssmap_le.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 270ec0db0a..9851942059 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -865,12 +865,12 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_item *bssmap_le_item = NULL;
proto_tree *bssmap_le_tree = NULL;
const gchar *str;
- sccp_msg_info_t* sccp_msg;
+ sccp_msg_info_t* sccp_msg_p;
- sccp_msg = pinfo->sccp_info;
+ sccp_msg_p = pinfo->sccp_info;
- if (!(sccp_msg && sccp_msg->data.co.assoc)) {
- sccp_msg = NULL;
+ if (!(sccp_msg_p && sccp_msg_p->data.co.assoc)) {
+ sccp_msg_p = NULL;
}
col_append_str(pinfo->cinfo, COL_INFO, "(BSSMAP LE) ");
@@ -901,8 +901,8 @@ dissect_bssmap_le(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
str = match_strval_idx((guint32) oct, gsm_bssmap_le_msg_strings, &idx);
- if (sccp_msg && !sccp_msg->data.co.label) {
- sccp_msg->data.co.label = se_strdup(val_to_str((guint32) oct, gsm_bssmap_le_msg_strings, "BSSMAP LE(0x%02x)"));
+ if (sccp_msg_p && !sccp_msg_p->data.co.label) {
+ sccp_msg_p->data.co.label = se_strdup(val_to_str((guint32) oct, gsm_bssmap_le_msg_strings, "BSSMAP LE(0x%02x)"));
}
/*