osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix 2 [-Wshadow] warnings 

svn path=/trunk/; revision=46377
This commit is contained in:
Bill Meier 2012-12-04 19:24:28 +00:00
parent 12f5acaefb
commit 7b69816cbb
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
epan/dissectors/packet-aprs.c
View File

@ -643,14 +643,14 @@ dissect_aprs_compressed_msg( tvbuff_t *tvb,
static const mic_e_dst_code_table_s * static const mic_e_dst_code_table_s *
dst_code_lookup( guint8 ch ) dst_code_lookup( guint8 ch )
{ {
guint index; guint indx;
index = 0; indx = 0;
while ( index < ( sizeof( dst_code ) / sizeof( mic_e_dst_code_table_s ) ) while ( indx < ( sizeof( dst_code ) / sizeof( mic_e_dst_code_table_s ) )
&& dst_code[ index ].key != ch && dst_code[ indx ].key != ch
&& dst_code[ index ].key > 0 ) && dst_code[ indx ].key > 0 )
index++; indx++;
return &( dst_code[ index ] ); return &( dst_code[ indx ] );
} }
static int static int
@ -1019,17 +1019,17 @@ static int
aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset )
{ {
int data_len; int data_len;
char *timezone; char *tzone;
guint8 ch; guint8 ch;
data_len = 8; data_len = 8;
timezone = "zulu"; tzone = "zulu";
ch= tvb_get_guint8( tvb, offset + 6 ); ch= tvb_get_guint8( tvb, offset + 6 );
if ( isdigit( ch ) ) if ( isdigit( ch ) )
{ /* MDHM */ { /* MDHM */
proto_tree_add_item( aprs_tree, hf_aprs_mdhm, tvb, offset, data_len, ENC_ASCII|ENC_NA ); proto_tree_add_item( aprs_tree, hf_aprs_mdhm, tvb, offset, data_len, ENC_ASCII|ENC_NA );
proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, data_len, timezone ); proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, data_len, tzone );
} }
else else
{ {
@ -1037,18 +1037,18 @@ aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset )
if ( ch == 'h' ) if ( ch == 'h' )
{ /* HMS */ { /* HMS */
proto_tree_add_item( aprs_tree, hf_aprs_hms, tvb, offset, data_len, ENC_ASCII|ENC_NA ); proto_tree_add_item( aprs_tree, hf_aprs_hms, tvb, offset, data_len, ENC_ASCII|ENC_NA );
proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, data_len, timezone ); proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset, data_len, tzone );
} }
else else
{ /* DHM */ { /* DHM */
switch ( ch ) switch ( ch )
{ {
case 'z' : timezone = "zulu"; break; case 'z' : tzone = "zulu"; break;
case '/' : timezone = "local"; break; case '/' : tzone = "local"; break;
default : timezone = "unknown"; break; default : tzone = "unknown"; break;
} }
proto_tree_add_item( aprs_tree, hf_aprs_dhm, tvb, offset, data_len, ENC_ASCII|ENC_NA ); proto_tree_add_item( aprs_tree, hf_aprs_dhm, tvb, offset, data_len, ENC_ASCII|ENC_NA );
proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset + 6, 1, timezone ); proto_tree_add_string( aprs_tree, hf_aprs_tz, tvb, offset + 6, 1, tzone );
} }
} }