aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-iax2.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-06-28 21:09:57 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2008-06-28 21:09:57 +0000
commit61284ca876f6d8f86e03a26cea536ce026c2d737 (patch)
tree376788913665f3c1530a800e451c46e56d3998d9 /epan/dissectors/packet-iax2.c
parent1133948d05aec6b46fbbbf6b1b8fd967df990032 (diff)
Fix some warnings reported by gcc -Wshadow ...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25628 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-iax2.c')
-rw-r--r--epan/dissectors/packet-iax2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 3b271e764f..6ab6f1a305 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -505,7 +505,7 @@ static guint iax_circuit_hash (gconstpointer v)
/* Find, or create, a circuit for the given
{address,porttype,port,call} quadruplet
*/
-static guint iax_circuit_lookup(const address *address,
+static guint iax_circuit_lookup(const address *address_p,
port_type ptype,
guint32 port,
guint32 callno)
@@ -513,7 +513,7 @@ static guint iax_circuit_lookup(const address *address,
iax_circuit_key key;
guint32 *circuit_id_p;
- key.addr = *address;
+ key.addr = *address_p;
key.ptype = ptype;
key.port = port;
key.callno = callno;
@@ -523,10 +523,10 @@ static guint iax_circuit_lookup(const address *address,
iax_circuit_key *new_key;
new_key = se_alloc(sizeof(iax_circuit_key));
- new_key->addr.type = address->type;
- new_key->addr.len = MIN(address->len,MAX_ADDRESS);
+ new_key->addr.type = address_p->type;
+ new_key->addr.len = MIN(address_p->len,MAX_ADDRESS);
new_key->addr.data = new_key->address_data;
- memcpy(new_key->address_data,address->data,new_key->addr.len);
+ memcpy(new_key->address_data,address_p->data,new_key->addr.len);
new_key->ptype = ptype;
new_key->port = port;
new_key->callno = callno;