summaryrefslogtreecommitdiff
path: root/text2pcap.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-08-01 21:12:19 -0400
committerEvan Huus <eapache@gmail.com>2014-08-02 01:12:50 +0000
commit005fd7eefd615ce0456f9d8d720da7af8010aba6 (patch)
tree5e09e4df0a03b37a49a458388f1eecd21d5b4558 /text2pcap.c
parentedb7a9110536cb079e26dafcdb5c12b028be84d3 (diff)
downloadwireshark-005fd7eefd615ce0456f9d8d720da7af8010aba6.tar.gz
Rename variable to avoid -Wshadow on mac buildbots
Change-Id: I13d591248718fcc36cd300bf28f779e2d9e0265a Reviewed-on: https://code.wireshark.org/review/3339 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'text2pcap.c')
-rw-r--r--text2pcap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/text2pcap.c b/text2pcap.c
index d5ba3e718d..52ac53d584 100644
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -634,22 +634,22 @@ static guint32
crc32c (const guint8* buf, unsigned int len, guint32 crc32_init)
{
unsigned int i;
- guint32 crc32;
+ guint32 crc;
- crc32 = crc32_init;
+ crc = crc32_init;
for (i = 0; i < len; i++)
- CRC32C(crc32, buf[i]);
+ CRC32C(crc, buf[i]);
- return crc32;
+ return crc;
}
static guint32
-finalize_crc32c (guint32 crc32)
+finalize_crc32c (guint32 crc)
{
guint32 result;
guint8 byte0,byte1,byte2,byte3;
- result = ~crc32;
+ result = ~crc;
byte0 = result & 0xff;
byte1 = (result>>8) & 0xff;
byte2 = (result>>16) & 0xff;