From 6ae67f96f8e2252b6d32b42708324ab77f8ff0fa Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 24 Sep 2012 12:03:58 -0700 Subject: Update cylinder info properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "cylinders_equal()/copy_cylinders()" functions were buggered, and only checked (and copied) the cylinder type. That was on purpose, since you do want to be able to change the type of a cylinder without changing the gasmix of the cylinder. HOWEVER, the reverse is also true: you may want to change the gasmix of a cylinder without changing the type. So it's not that the type of the cylinder is special - it's that the type and the gasmix should be considered separately. Do that properly for the equipment editing case. Reported-by: Ďoďo Signed-off-by: Linus Torvalds --- dive.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'dive.h') diff --git a/dive.h b/dive.h index e202279af..4b00b4eba 100644 --- a/dive.h +++ b/dive.h @@ -97,8 +97,6 @@ extern gboolean cylinder_nodata(cylinder_t *cyl); extern gboolean cylinder_nosamples(cylinder_t *cyl); extern gboolean cylinder_none(void *_data); extern gboolean no_cylinders(cylinder_t *cyl); -extern gboolean cylinders_equal(cylinder_t *cyl1, cylinder_t *cyl2); -extern void copy_cylinders(cylinder_t *cyl1, cylinder_t *cyl2); extern gboolean no_weightsystems(weightsystem_t *ws); extern gboolean weightsystems_equal(weightsystem_t *ws1, weightsystem_t *ws2); -- cgit v1.2.3-70-g09d2