diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-17 09:58:23 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-17 09:04:20 -0700 |
| commit | a7bbb6c1cc5c5b9ed3dc48cdb4da910214d51e96 (patch) | |
| tree | 166a4d2a6c0e44d9ec0e03ef45274d038e93244d /core/import-csv.c | |
| parent | 67aec56f8c276cef9e1809404be2141d865bfe96 (diff) | |
| download | subsurface-a7bbb6c1cc5c5b9ed3dc48cdb4da910214d51e96.tar.gz | |
filter: remove filter_preset_table_t
We used a typedef "filter_preset_table_t" for the filter preset table,
because it is a "std::vector<filter_preset>". However, that is in
contrast to all the other global tables (dives, trips, sites) that we
have.
Therefore, turn this into a standard struct, which simply inherits
from "std::vector<filter_preset>". Note that while inheriting from
std::vector<> is generally not recommended, it is not a problem
here, because we don't modify it in any shape or form.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-csv.c')
| -rw-r--r-- | core/import-csv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/import-csv.c b/core/import-csv.c index 846c397d7..09bcf9e93 100644 --- a/core/import-csv.c +++ b/core/import-csv.c @@ -105,7 +105,7 @@ static char *parse_dan_new_line(char *buf, const char *NL) static int try_to_xslt_open_csv(const char *filename, struct memblock *mem, const char *tag); static int parse_dan_format(const char *filename, char **params, int pnr, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *filter_presets) + struct filter_preset_table *filter_presets) { int ret = 0, i; size_t end_ptr = 0; @@ -286,7 +286,7 @@ static int parse_dan_format(const char *filename, char **params, int pnr, struct int parse_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *filter_presets) + struct filter_preset_table *filter_presets) { int ret, i; struct memblock mem; @@ -808,8 +808,8 @@ int parse_txt_file(const char *filename, const char *csv, struct dive_table *tab #define SBPARAMS 40 static int parse_seabear_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate, - struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, filter_preset_table_t *filter_presets); -int parse_seabear_log(const char *filename, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, filter_preset_table_t *filter_presets) + struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, struct filter_preset_table *filter_presets); +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) { char *params[SBPARAMS]; int pnr = 0; @@ -826,7 +826,7 @@ int parse_seabear_log(const char *filename, struct dive_table *table, struct tri static int parse_seabear_csv_file(const char *filename, char **params, int pnr, const char *csvtemplate, struct dive_table *table, struct trip_table *trips, struct dive_site_table *sites, - filter_preset_table_t *filter_presets) + struct filter_preset_table *filter_presets) { int ret, i; struct memblock mem; @@ -954,7 +954,7 @@ static int parse_seabear_csv_file(const char *filename, char **params, int pnr, } int parse_manual_file(const char *filename, char **params, int pnr, struct dive_table *table, struct trip_table *trips, - struct dive_site_table *sites, filter_preset_table_t *filter_presets) + struct dive_site_table *sites, struct filter_preset_table *filter_presets) { struct memblock mem; time_t now; |