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/divelist.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/divelist.c')
| -rw-r--r-- | core/divelist.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/divelist.c b/core/divelist.c index de9509471..5eae5e638 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -65,15 +65,13 @@ void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2max_p) int maxo2 = -1, maxhe = -1, mino2 = 1000; - for (i = 0; i < MAX_CYLINDERS; i++) { - const cylinder_t *cyl = dive->cylinder + i; + for (i = 0; i < dive->cylinders.nr; i++) { + const cylinder_t *cyl = dive->cylinders.cylinders + i; int o2 = get_o2(cyl->gasmix); int he = get_he(cyl->gasmix); if (!is_cylinder_used(dive, i)) continue; - if (cylinder_none(cyl)) - continue; if (o2 > maxo2) maxo2 = o2; if (he > maxhe) @@ -349,9 +347,9 @@ static double calculate_airuse(const struct dive *dive) int airuse = 0; int i; - for (i = 0; i < MAX_CYLINDERS; i++) { + for (i = 0; i < dive->cylinders.nr; i++) { pressure_t start, end; - const cylinder_t *cyl = dive->cylinder + i; + const cylinder_t *cyl = dive->cylinders.cylinders + i; start = cyl->start.mbar ? cyl->start : cyl->sample_start; end = cyl->end.mbar ? cyl->end : cyl->sample_end; |