From 005fd7eefd615ce0456f9d8d720da7af8010aba6 Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Fri, 1 Aug 2014 21:12:19 -0400 Subject: Rename variable to avoid -Wshadow on mac buildbots Change-Id: I13d591248718fcc36cd300bf28f779e2d9e0265a Reviewed-on: https://code.wireshark.org/review/3339 Reviewed-by: Evan Huus --- text2pcap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'text2pcap.c') 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; -- cgit v1.2.1