mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Function to look for new line on DL7 import

Browse source 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
This commit is contained in:
Miika Turkia 2018-01-07 15:33:04 +02:00 • committed by mturkia
parent f2beeb4078
commit 5e9e6625d0
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/import-csv.c
View file

@ -50,6 +50,23 @@ void add_sample_data(struct sample *sample, enum csv_format type, double val)
} }
} }
char *parse_dan_new_line(char *buf, const char *NL)
{
char *iter = buf;
if (!iter)
return NULL;
iter = strstr(iter, NL);
if (iter) {
iter += strlen(NL);
} else {
fprintf(stderr, "DEBUG: No new line found\n");
return NULL;
}
return iter;
}
int parse_dan_format(const char *filename, char **params, int pnr) int parse_dan_format(const char *filename, char **params, int pnr)
{ {
int ret = 0, i; int ret = 0, i;
@ -144,10 +161,8 @@ int parse_dan_format(const char *filename, char **params, int pnr)
/* Search for the next line */ /* Search for the next line */
if (iter) if (iter)
iter = strstr(iter, NL); iter = parse_dan_new_line(iter, NL);
if (iter) { if (!iter) {
iter += strlen(NL);
} else {
fprintf(stderr, "DEBUG: No new line found"); fprintf(stderr, "DEBUG: No new line found");
return -1; return -1;
} }
@ -169,11 +184,10 @@ int parse_dan_format(const char *filename, char **params, int pnr)
end_ptr += ptr - (char *)mem_csv.buffer; end_ptr += ptr - (char *)mem_csv.buffer;
return report_error(translate("gettextFromC", "No dive profile found from '%s'"), filename); return report_error(translate("gettextFromC", "No dive profile found from '%s'"), filename);
} }
if (ptr) if (ptr)
ptr = strstr(ptr, NL); ptr = parse_dan_new_line(ptr, NL);
if (ptr) { if (!ptr) {
ptr += strlen(NL);
} else {
fprintf(stderr, "DEBUG: Data corrupt"); fprintf(stderr, "DEBUG: Data corrupt");
return -1; return -1;
} }