diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-04 19:24:28 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-04 19:24:28 +0000 |
| commit | 7b69816cbb04b06dd315931115c0331e7bc41eff (patch) | |
| tree | 735e195e0f40d36d9b8c2b9e0d0c6275cef77458 /epan/dissectors/packet-aprs.c | |
| parent | 12f5acaefbf1cf56ed774898e5a69b8373f04fba (diff) | |
| download | wireshark-7b69816cbb04b06dd315931115c0331e7bc41eff.tar.gz | |
Fix 2 [-Wshadow] warnings
svn path=/trunk/; revision=46377
Diffstat (limited to 'epan/dissectors/packet-aprs.c')
| -rw-r--r-- | epan/dissectors/packet-aprs.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-aprs.c b/epan/dissectors/packet-aprs.c index 2cc5e07c3d..0c868ade64 100644 --- a/epan/dissectors/packet-aprs.c +++ b/epan/dissectors/packet-aprs.c @@ -643,14 +643,14 @@ dissect_aprs_compressed_msg( tvbuff_t *tvb, static const mic_e_dst_code_table_s * dst_code_lookup( guint8 ch ) { - guint index; - - index = 0; - while ( index < ( sizeof( dst_code ) / sizeof( mic_e_dst_code_table_s ) ) - && dst_code[ index ].key != ch - && dst_code[ index ].key > 0 ) - index++; - return &( dst_code[ index ] ); + guint indx; + + indx = 0; + while ( indx < ( sizeof( dst_code ) / sizeof( mic_e_dst_code_table_s ) ) + && dst_code[ indx ].key != ch + && dst_code[ indx ].key > 0 ) + indx++; + return &( dst_code[ indx ] ); } static int @@ -1019,17 +1019,17 @@ static int aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) { int data_len; - char *timezone; + char *tzone; guint8 ch; data_len = 8; - timezone = "zulu"; + tzone = "zulu"; ch= tvb_get_guint8( tvb, offset + 6 ); if ( isdigit( ch ) ) { /* MDHM */ 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 { @@ -1037,18 +1037,18 @@ aprs_timestamp( proto_tree *aprs_tree, tvbuff_t *tvb, int offset ) if ( ch == 'h' ) { /* HMS */ 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 { /* DHM */ switch ( ch ) { - case 'z' : timezone = "zulu"; break; - case '/' : timezone = "local"; break; - default : timezone = "unknown"; break; + case 'z' : tzone = "zulu"; break; + case '/' : tzone = "local"; 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_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 ); } } |