diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-17 20:15:23 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-23 18:17:02 -0700 |
| commit | d508a16aca91b521719d929cd59db381c44cd7ad (patch) | |
| tree | af076eb66fcd4002a01a29a46f8b80d4d4129994 /core/import-csv.h | |
| parent | b9b51ffd4ebd14e085bef69ee0daf6a1927cc960 (diff) | |
| download | subsurface-d508a16aca91b521719d929cd59db381c44cd7ad.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-csv.h')
| -rw-r--r-- | core/import-csv.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 |