diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-29 14:48:08 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-29 14:48:08 +0000 |
| commit | 37a66d9e0b8e6c790d4094f04bd1ceb39777e743 (patch) | |
| tree | 50154174fa1337505dfe8de7e1b0908d286028a4 /epan/dissectors/packet-asterix.c | |
| parent | 0ad98563a24b8685545825aac889ef43bfc58809 (diff) | |
| download | wireshark-37a66d9e0b8e6c790d4094f04bd1ceb39777e743.tar.gz | |
From Marko Hrastovec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9347 :
Asterix dissector had two #if 0 ... #endif blocks because it obviously did not
compile on some systems.
Blocks were created because of mistyped variable names and variable not used
warning/error.
The errors were corrected.
svn path=/trunk/; revision=52949
Diffstat (limited to 'epan/dissectors/packet-asterix.c')
| -rw-r--r-- | epan/dissectors/packet-asterix.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-asterix.c b/epan/dissectors/packet-asterix.c index a57aceb919..2fc3179c09 100644 --- a/epan/dissectors/packet-asterix.c +++ b/epan/dissectors/packet-asterix.c @@ -2074,11 +2074,9 @@ static const value_string valstr_008_040_FST_LST[] = { static const FieldPart I008_040_ORG = { 1, 1.0, FIELD_PART_UINT, &hf_008_040_ORG, NULL }; static const FieldPart I008_040_INT = { 3, 1.0, FIELD_PART_UINT, &hf_008_040_INT, NULL }; static const FieldPart I008_040_FST_LST = { 2, 1.0, FIELD_PART_UINT, &hf_008_040_FST_LST, NULL }; -#if 0 static const FieldPart I008_040_CSN = { 8, 1.0, FIELD_PART_UINT, &hf_008_040_CSN, NULL }; -#endif static const FieldPart *I008_040_PARTS[] = { &I008_040_ORG, &I008_040_INT, &IXXX_2bit_spare, &I008_040_FST_LST, - &I008_040_FST_LST, NULL }; + &I008_040_CSN, NULL }; /* Sequence of Contour Points in SPF Notation */ static const FieldPart I008_050_X1 = { 8, 1.0/64.0, FIELD_PART_FLOAT, &hf_008_050_X1, NULL }; @@ -3621,7 +3619,6 @@ static const value_string valstr_062_380_09_PTYP[] = { { 11, "Transition altitude" }, { 0, NULL } }; -#if 0 static const value_string valstr_062_380_09_TD[] = { { 0, "N/A" }, { 1, "Turn right" }, @@ -3629,7 +3626,6 @@ static const value_string valstr_062_380_09_TD[] = { { 3, "No turn" }, { 0, NULL } }; -#endif static const value_string valstr_062_380_09_TRA[] = { { 0, "TTR not available" }, { 1, "TTR available" }, @@ -5525,7 +5521,7 @@ void proto_register_asterix (void) { &hf_062_380_09_LAT, { "LAT[deg]", "asterix.062_380_09_LAT", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_062_380_09_LON, { "LON[deg]", "asterix.062_380_09_LON", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, { &hf_062_380_09_PTYP, { "PTYP", "asterix.062_380_09_PTYP", FT_UINT8, BASE_DEC, VALS (valstr_062_380_09_PTYP), 0xf0, NULL, HFILL } }, - { &hf_062_380_09_TD, { "TD", "asterix.062_380_09_TD", FT_UINT8, BASE_DEC, VALS (valstr_062_380_09_PTYP), 0x0c, NULL, HFILL } }, + { &hf_062_380_09_TD, { "TD", "asterix.062_380_09_TD", FT_UINT8, BASE_DEC, VALS (valstr_062_380_09_TD), 0x0c, NULL, HFILL } }, { &hf_062_380_09_TRA, { "TRA", "asterix.062_380_09_TRA", FT_UINT8, BASE_DEC, VALS (valstr_062_380_09_TRA), 0x02, NULL, HFILL } }, { &hf_062_380_09_TOA, { "TOA", "asterix.062_380_09_TOA", FT_UINT8, BASE_DEC, VALS (valstr_062_380_09_TOA), 0x01, NULL, HFILL } }, { &hf_062_380_09_TOV, { "TOV[s]", "asterix.062_380_09_TOV", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL } }, |