From 62d9728ebe624b8dffd6976064f225a4c78762e4 Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sun, 7 Jan 2018 08:50:23 +0200 Subject: Ignore empty dives This is first step towards parsing "empty" dives properly. I.e. now the updated test dive parses properly. Signed-off-by: Miika Turkia --- core/import-csv.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/import-csv.c b/core/import-csv.c index c5b4ff8f3..7d46fdb76 100644 --- a/core/import-csv.c +++ b/core/import-csv.c @@ -125,6 +125,21 @@ int parse_dan_format(const char *filename, char **params, int pnr) params[pnr + 5] = strdup(tmpbuf); params[pnr + 6] = NULL; + /* Search for the next line */ + if (iter) + iter = strstr(iter, NL); + if (iter) { + iter += strlen(NL); + } else { + fprintf(stderr, "DEBUG: No new line found"); + return -1; + } + /* We got a trailer, no samples on this dive */ + if (strncmp(iter, "ZDT", 3) == 0) { + end_ptr = iter - (char *)mem.buffer; + continue; + } + ptr = strstr(ptr, "ZDP{"); if (ptr && ptr[4] == '}') { end_ptr += ptr - (char *)mem_csv.buffer; -- cgit v1.2.3-70-g09d2