From: robertlipe Date: Tue, 11 Feb 2014 21:14:49 +0000 (+0000) Subject: Minor code hygeine in stmsdf and overlay. X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~228 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=97ac5efff4a5d80b1831b319f20300057b829fa3;p=gpsbabel.git Minor code hygeine in stmsdf and overlay. --- diff --git a/gpsbabel/magproto.cc b/gpsbabel/magproto.cc index 7c53a3591..103c6eba1 100644 --- a/gpsbabel/magproto.cc +++ b/gpsbabel/magproto.cc @@ -1530,7 +1530,7 @@ mag_route_trl(const route_head* rte) Waypoint* waypointp; char obuff[256]; char buff1[64], buff2[64]; - char* pbuff, *owpt; + char* pbuff; QString icon_token; int i, numlines, thisline; diff --git a/gpsbabel/overlay.cc b/gpsbabel/overlay.cc index 55e1ba01e..b0a6b77ce 100644 --- a/gpsbabel/overlay.cc +++ b/gpsbabel/overlay.cc @@ -308,7 +308,10 @@ static void ovl_read(void) break; case KEY_AREA : aktArea = atoi(pstr); - if (aktTyp==5 || aktTyp==5 || aktTyp==7) { + // 2014-02-11. This code originally tested five twice. + // I changed it to test 5, 6, and 7 as that was "obviously" + // the author's intent. + if (aktTyp == 5 || aktTyp == 6 || aktTyp == 7) { isSection = SECTION_PUNKTE; // Rechteck, Kreis, Dreieck } break; diff --git a/gpsbabel/stmsdf.cc b/gpsbabel/stmsdf.cc index 5b9c630fe..9e63c0562 100644 --- a/gpsbabel/stmsdf.cc +++ b/gpsbabel/stmsdf.cc @@ -142,10 +142,14 @@ parse_header(char* line) case 28: /* X9 TrackLog (Suunto Trek Manager */ break; + // 2014-02-11: Added breaks after 78 and 79 as the author "obviously" + // meant to treat those as handled. case 78: prod = "S6 SkiChrono"; + break; case 79: prod = "S6 Skilog"; + break; default: if (prod == NULL) {