summaryrefslogtreecommitdiffstats
path: root/parse-xml.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2012-11-18 07:55:41 -1000
committerGravatar Dirk Hohndel <dirk@hohndel.org>2012-11-19 12:03:44 -0800
commit2a78f3436ccf157977eccf9435c2680e2d7bc3d3 (patch)
treee3c2386c299e5a8d7db012fd6943b49cf63bbf45 /parse-xml.c
parent8a45a3ffb9e55b29cb7bdd056ba60eb7968e8fcd (diff)
downloadsubsurface-2a78f3436ccf157977eccf9435c2680e2d7bc3d3.tar.gz
Fix the XML gps parsing and saving when using non-US locales
The GPS parsing and saving was using sscanf and sprintf respecively, and since it is using floating point values (boo!) that affects both of them. In a C/US locale, we use a period for decimal values, while most European locales use a comma. We really should probably just fix things to use integer values (degrees and nanodegrees?) but this is the simplest fix/workaround for the issue. Probably nobody ever really noticed until I tested the Swedish locale for grins, since we don't have a good way to actually set the GPS coordinates yet. I've got a few dives with GPS information that I entered manually. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
-rw-r--r--parse-xml.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/parse-xml.c b/parse-xml.c
index f62ce9891..15138f43e 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -1045,15 +1045,11 @@ static int uddf_dive_match(struct dive **divep, const char *name, int len, char
static void gps_location(char *buffer, void *_dive)
{
- int i;
+ char *end;
struct dive *dive = _dive;
- double latitude, longitude;
- i = sscanf(buffer, "%lf %lf", &latitude, &longitude);
- if (i == 2) {
- dive->latitude = latitude;
- dive->longitude = longitude;
- }
+ dive->latitude = g_ascii_strtod(buffer, &end);
+ dive->longitude = g_ascii_strtod(end, &end);
free(buffer);
}