osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix shadow variable warnings. 

Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7
Reviewed-on: https://code.wireshark.org/review/16625
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-07-24 10:14:48 -04:00
parent a06042d614
commit 8505fb08c1
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/wimax/crc.c
View File

@ -55,13 +55,13 @@ extern guint16 crc16_table[256];
*/
void wimax_mac_gen_crc32_table(void)
{
guint32 index, bit;
guint32 i, bit;
guint32 crc;
/* little-endian (reflected) algorithm */
for ( index = 0; index < G_N_ELEMENTS(crc32_table); index++ )
for ( i = 0; i < G_N_ELEMENTS(crc32_table); i++ )
{
crc = ( index << 24 );
crc = ( i << 24 );
for ( bit = 0; bit < 8; bit++ )
{
if ( crc & 0x80000000U )
@ -69,7 +69,7 @@ void wimax_mac_gen_crc32_table(void)
else
crc = ( crc << 1 );
}
crc32_table[index] = crc;
crc32_table[i] = crc;
}
}
@ -90,12 +90,12 @@ void wimax_mac_gen_crc32_table(void)
*/
void wimax_mac_gen_crc8_table(void)
{
guint index, bit;
guint i, bit;
guint8 crc;
for ( index = 0; index < G_N_ELEMENTS(crc8_table); index++ )
for ( i = 0; i < G_N_ELEMENTS(crc8_table); i++ )
{
crc = index;
crc = i;
for ( bit = 0; bit < 8; bit++ )
{
if ( crc & 0x80 )
@ -103,7 +103,7 @@ void wimax_mac_gen_crc8_table(void)
else
crc = ( crc << 1 );
}
crc8_table[index] = crc;
crc8_table[i] = crc;
}
}
#endif

6
wiretap/ngsniffer.c
View File

@ -107,7 +107,7 @@ static const char ngsniffer_magic[] = {
struct vers_rec {
gint16 maj_vers; /* major version number */
gint16 min_vers; /* minor version number */
gint16 time; /* DOS-format time */
gint16 time_dos; /* DOS-format time */
gint16 date; /* DOS-format date */
gint8 type; /* what type of records follow */
guint8 network; /* network type */
@ -746,7 +746,7 @@ ngsniffer_open(wtap *wth, int *err, gchar **err_info)
* version-dependent?
*/
#if 0
start_time = pletoh16(&version.time);
start_time = pletoh16(&version.time_dos);
tm.tm_hour = (start_time&0xf800)>>11;
tm.tm_min = (start_time&0x7e0)>>5;
tm.tm_sec = (start_time&0x1f)<<1;
@ -2071,7 +2071,7 @@ ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
min_vers = 0;
version.maj_vers = GUINT16_TO_LE(maj_vers);
version.min_vers = GUINT16_TO_LE(min_vers);
version.time = 0;
version.time_dos = 0;
version.date = GUINT16_TO_LE(start_date);
version.type = 4;
version.network = wtap_encap[wdh->encap];