From d508a16aca91b521719d929cd59db381c44cd7ad Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 17 Oct 2020 20:15:23 +0200 Subject: parser: replace params[] code by new xml_params struct This fixes a load of memory holes, and makes the code (hopefully) more readable. Signed-off-by: Berthold Stoeger --- core/import-csv.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/import-csv.h') diff --git a/core/import-csv.h b/core/import-csv.h index af8836dd7..1ef4ee46b 100644 --- a/core/import-csv.h +++ b/core/import-csv.h @@ -4,6 +4,8 @@ #include "filterpreset.h" +struct xml_params; + enum csv_format { CSV_DEPTH, CSV_TEMP, @@ -23,14 +25,14 @@ enum csv_format { extern "C" { #endif -int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate, struct dive_table *table, +int parse_csv_file(const char *filename, struct xml_params *params, const char *csvtemplate, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, struct filter_preset_table *filter_presets); int try_to_open_csv(struct memblock *mem, enum csv_format type, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); int parse_txt_file(const char *filename, const char *csv, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites); int parse_seabear_log(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, struct filter_preset_table *filter_presets); -int parse_manual_file(const char *filename, char **params, int pnr, struct dive_table *table, struct trip_table *trips, +int parse_manual_file(const char *filename, struct xml_params *params, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, struct filter_preset_table *filter_presets); #ifdef __cplusplus -- cgit v1.2.3-70-g09d2