mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Uemis downloader: parse_divespot should return if it was successful

Browse source 
But sadly the code then doesn't actually use that return value, so this is
not quite perfect, yet.

[Dirk Hohndel: refactored one huge commit into smaller pieces]

Signed-off-by: Guido Lerch <guido.lerch@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Guido Lerch 2015-09-05 11:09:10 -07:00 • committed by Dirk Hohndel
parent b7f5871e59
commit 4ba5dd85d4
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
uemis-downloader.c
View file

@ -637,7 +637,7 @@ fs_error:
return false; return false;
} }
static void parse_divespot(char *buf) static bool parse_divespot(char *buf)
{ {
char *bp = buf + 1; char *bp = buf + 1;
char *tp = next_token(&bp); char *tp = next_token(&bp);
@ -646,14 +646,17 @@ static void parse_divespot(char *buf)
int divespot, len; int divespot, len;
double latitude = 0.0, longitude = 0.0; double latitude = 0.0, longitude = 0.0;
// dive spot got deleted, so fail here
if (strstr(bp, "deleted{bool{true"))
return false;
// not a dive spot, fail here
if (strcmp(tp, "divespot")) if (strcmp(tp, "divespot"))
return; return false;
do do
tag = next_token(&bp); tag = next_token(&bp);
while (*tag && strcmp(tag, "object_id")); while (*tag && strcmp(tag, "object_id"));
if (!*tag) if (!*tag)
return; return false;
next_token(&bp); next_token(&bp);
val = next_token(&bp); val = next_token(&bp);
divespot = atoi(val); divespot = atoi(val);
@ -672,7 +675,9 @@ static void parse_divespot(char *buf)
latitude = ascii_strtod(val, NULL); latitude = ascii_strtod(val, NULL);
} }
} while (tag && *tag); } while (tag && *tag);
uemis_set_divelocation(divespot, locationstring, longitude, latitude); uemis_set_divelocation(divespot, locationstring, longitude, latitude);
return true;
} }
static void track_divespot(char *val, int diveid, uint32_t dive_site_uuid) static void track_divespot(char *val, int diveid, uint32_t dive_site_uuid)