diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-18 21:49:47 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-18 21:49:47 +0000 |
| commit | de4c6ff5157aeec5f1e03f514a71f8530666ed21 (patch) | |
| tree | c50b56a45e65cddff9bc5e5c6a89f6e1ce51d25f /epan/dissectors/packet-ftp.c | |
| parent | 55669f7127c94adcaeb5deae956f97913bd3cdeb (diff) | |
Fix a number of gcc _Wshadow warnings
svn path=/trunk/; revision=31557
Diffstat (limited to 'epan/dissectors/packet-ftp.c')
| -rw-r--r-- | epan/dissectors/packet-ftp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 76e1c2248b..e535a5ef5e 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -187,7 +187,7 @@ parse_port_pasv(const guchar *line, int linelen, guint32 *ftp_ip, char *p; guchar c; int i; - int address[4], port[2]; + int ip_address[4], port[2]; gboolean ret = FALSE; /* @@ -214,14 +214,14 @@ parse_port_pasv(const guchar *line, int linelen, guint32 *ftp_ip, * See if we have six numbers. */ i = sscanf(p, "%d,%d,%d,%d,%d,%d", - &address[0], &address[1], &address[2], &address[3], + &ip_address[0], &ip_address[1], &ip_address[2], &ip_address[3], &port[0], &port[1]); if (i == 6) { /* * We have a winner! */ *ftp_port = ((port[0] & 0xFF)<<8) | (port[1] & 0xFF); - *ftp_ip = g_htonl((address[0] << 24) | (address[1] <<16) | (address[2] <<8) | address[3]); + *ftp_ip = g_htonl((ip_address[0] << 24) | (ip_address[1] <<16) | (ip_address[2] <<8) | ip_address[3]); ret = TRUE; break; } |