From 4355ce3924943eb22a6e3296372710953ff0b99d Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Sun, 4 Aug 2019 14:42:21 +0200
Subject: [PATCH] Cleanup: move copy_cylinder_types() from dive.c to
 equipment.c

Thus, future callers will not have to include the monster dive.h
include if they just want to copy cylinders.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 core/dive.c      | 23 -----------------------
 core/equipment.c | 22 ++++++++++++++++++++++
 core/equipment.h |  1 +
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/core/dive.c b/core/dive.c
index 241125f61..6043845f6 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -440,7 +440,6 @@ struct dive *move_dive(struct dive *s)
 		d->_component = copy_string(s->_component)
 
 // copy elements, depending on bits in what that are set
-static void copy_cylinder_types(const struct dive *s, struct dive *d);
 void selective_copy_dive(const struct dive *s, struct dive *d, struct dive_components what, bool clear)
 {
 	if (clear)
@@ -517,28 +516,6 @@ int nr_weightsystems(const struct dive *dive)
 	return dive->weightsystems.nr;
 }
 
-static void copy_cylinder_type(const cylinder_t *s, cylinder_t *d)
-{
-	free(d->type.description);
-	d->type = s->type;
-	d->type.description = s->type.description ? strdup(s->type.description) : NULL;
-	d->gasmix = s->gasmix;
-	d->depth = s->depth;
-	d->cylinder_use = s->cylinder_use;
-	d->manually_added = true;
-}
-
-/* copy the equipment data part of the cylinders but keep pressures */
-static void copy_cylinder_types(const struct dive *s, struct dive *d)
-{
-	int i;
-	if (!s || !d)
-		return;
-
-	for (i = 0; i < MAX_CYLINDERS; i++)
-		copy_cylinder_type(s->cylinder + i, d->cylinder + i);
-}
-
 void copy_cylinders(const struct dive *s, struct dive *d, bool used_only)
 {
 	int i, j;
diff --git a/core/equipment.c b/core/equipment.c
index 9dbe6bcd2..d97ed6e4f 100644
--- a/core/equipment.c
+++ b/core/equipment.c
@@ -288,6 +288,28 @@ void reset_cylinders(struct dive *dive, bool track_gas)
 	}
 }
 
+static void copy_cylinder_type(const cylinder_t *s, cylinder_t *d)
+{
+	free(d->type.description);
+	d->type = s->type;
+	d->type.description = s->type.description ? strdup(s->type.description) : NULL;
+	d->gasmix = s->gasmix;
+	d->depth = s->depth;
+	d->cylinder_use = s->cylinder_use;
+	d->manually_added = true;
+}
+
+/* copy the equipment data part of the cylinders but keep pressures */
+void copy_cylinder_types(const struct dive *s, struct dive *d)
+{
+	int i;
+	if (!s || !d)
+		return;
+
+	for (i = 0; i < MAX_CYLINDERS; i++)
+		copy_cylinder_type(s->cylinder + i, d->cylinder + i);
+}
+
 #ifdef DEBUG_CYL
 void dump_cylinders(struct dive *dive, bool verbose)
 {
diff --git a/core/equipment.h b/core/equipment.h
index 4b5113740..beef30842 100644
--- a/core/equipment.h
+++ b/core/equipment.h
@@ -57,6 +57,7 @@ struct weightsystem_table {
 
 extern int cylinderuse_from_text(const char *text);
 extern void copy_weights(const struct weightsystem_table *s, struct weightsystem_table *d);
+extern void copy_cylinder_types(const struct dive *s, struct dive *d);
 extern void add_cloned_weightsystem(struct weightsystem_table *t, weightsystem_t ws);
 extern void add_cylinder_description(const cylinder_type_t *);
 extern void add_weightsystem_description(const weightsystem_t *);