Cleanup: pass gasmix by value

In a previous commit, the get_gasmix_* functions were changed to
return by value. For consistency, also pass gasmix by value.

Note that on common 64-bit platforms struct gasmix is the size
of a pointer [2 * 32 bit vs. 64 bit] and therefore uses the
same space on the stack. On 32-bit platforms, the stack use
is probably doubled, but in return a dereference is avoided.

Supporting arbitrary gas-mixes (H2, Ar, ...) will be such an
invasive change that going back to pointers is probably the
least of our worries.

This commit is a step in const-ifying input parameters (passing
by value is the ultimate way of signaling that the input parameter
will not be changed [unless there are references to said parameter]).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 3 insertions, 3 deletions

diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c
index 826ad6a9d..acc43e4f0 100644
--- a/smtk-import/smartrak.c
+++ b/smtk-import/smartrak.c
@@ -506,16 +506,16 @@ static void merge_cylinder_type(cylinder_type_t *src, cylinder_type_t *dst)
 	}
 }
 
-static void merge_cylinder_mix(struct gasmix *src, struct gasmix *dst)
+static void merge_cylinder_mix(struct gasmix src, struct gasmix *dst)
 {
 	if (!dst->o2.permille)
-		*dst = *src;
+		*dst = src;
 }
 
 static void merge_cylinder_info(cylinder_t *src, cylinder_t *dst)
 {
 	merge_cylinder_type(&src->type, &dst->type);
-	merge_cylinder_mix(&src->gasmix, &dst->gasmix);
+	merge_cylinder_mix(src->gasmix, &dst->gasmix);
 	MERGE_MAX(dst, dst, src, start.mbar);
 	MERGE_MIN(dst, dst, src, end.mbar);
 	if (!dst->cylinder_use)