diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-04 18:44:57 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-11-09 19:19:04 +0100 |
| commit | 7c9f46acd202121e67557bb634961ef17a9f6c1f (patch) | |
| tree | f21b6ff42a930cc97c31db9f20c03f1613e70291 /core/import-csv.c | |
| parent | cd4f66014f7b5269dff9e088c9d7d38241c03156 (diff) | |
| download | subsurface-7c9f46acd202121e67557bb634961ef17a9f6c1f.tar.gz | |
Core: remove MAX_CYLINDERS restriction
Instead of using fixed size arrays, use a new cylinder_table structure.
The code copies the weightsystem code, but is significantly more complex
because cylinders are such an integral part of the core.
Two functions to access the cylinders were added:
get_cylinder() and get_or_create_cylinder()
The former does a simple array access and supposes that the cylinder
exists. The latter is used by the parser(s) and if a cylinder with
the given id does not exist, cylinders up to that id are generated.
One point will make C programmers cringe: the cylinder structure is
passed by value. This is due to the way the table-macros work. A
refactoring of the table macros is planned. It has to be noted that
the size of a cylinder_t is 64 bytes, i.e. 8 long words on a 64-bit
architecture, so passing on the stack is probably not even significantly
slower than passing as reference.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/import-csv.c')
| -rw-r--r-- | core/import-csv.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/core/import-csv.c b/core/import-csv.c index 9c391025e..f34cb6802 100644 --- a/core/import-csv.c +++ b/core/import-csv.c @@ -509,8 +509,8 @@ int parse_txt_file(const char *filename, const char *csv, struct dive_table *tab int prev_depth = 0, cur_sampletime = 0, prev_setpoint = -1, prev_ndl = -1; bool has_depth = false, has_setpoint = false, has_ndl = false; char *lineptr, *key, *value; - int cur_cylinder_index = 0; unsigned int prev_time = 0; + cylinder_t cyl; struct dive *dive; struct divecomputer *dc; @@ -538,25 +538,25 @@ int parse_txt_file(const char *filename, const char *csv, struct dive_table *tab dive->dc.divemode = CCR; dive->dc.no_o2sensors = 2; - dive->cylinder[cur_cylinder_index].cylinder_use = OXYGEN; - dive->cylinder[cur_cylinder_index].type.size.mliter = 3000; - dive->cylinder[cur_cylinder_index].type.workingpressure.mbar = 200000; - dive->cylinder[cur_cylinder_index].type.description = strdup("3l Mk6"); - dive->cylinder[cur_cylinder_index].gasmix.o2.permille = 1000; - cur_cylinder_index++; - - dive->cylinder[cur_cylinder_index].cylinder_use = DILUENT; - dive->cylinder[cur_cylinder_index].type.size.mliter = 3000; - dive->cylinder[cur_cylinder_index].type.workingpressure.mbar = 200000; - dive->cylinder[cur_cylinder_index].type.description = strdup("3l Mk6"); + cyl.cylinder_use = OXYGEN; + cyl.type.size.mliter = 3000; + cyl.type.workingpressure.mbar = 200000; + cyl.type.description = "3l Mk6"; + cyl.gasmix.o2.permille = 1000; + add_cloned_cylinder(&dive->cylinders, cyl); + + cyl.cylinder_use = DILUENT; + cyl.type.size.mliter = 3000; + cyl.type.workingpressure.mbar = 200000; + cyl.type.description = "3l Mk6"; value = parse_mkvi_value(memtxt.buffer, "Helium percentage"); he = atoi(value); free(value); value = parse_mkvi_value(memtxt.buffer, "Nitrogen percentage"); - dive->cylinder[cur_cylinder_index].gasmix.o2.permille = (100 - atoi(value) - he) * 10; + cyl.gasmix.o2.permille = (100 - atoi(value) - he) * 10; free(value); - dive->cylinder[cur_cylinder_index].gasmix.he.permille = he * 10; - cur_cylinder_index++; + cyl.gasmix.he.permille = he * 10; + add_cloned_cylinder(&dive->cylinders, cyl); lineptr = strstr(memtxt.buffer, "Dive started at"); while (!empty_string(lineptr) && (lineptr = strchr(lineptr, '\n'))) { |