From c26c370c2b519cbceaa231cc3c840c78ca92d2a7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 18 Aug 2012 08:28:52 -0700 Subject: Correct multi-edit equipment update logic I lied in the commit message for commit 0468535524a3 ("When editing multiple files, don't override existing equipment entries"); the changes there did not parallel the logic for the string entries. Now I think it does. Signed-off-by: Dirk Hohndel --- dive.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'dive.h') diff --git a/dive.h b/dive.h index b42668c16..41f427a2c 100644 --- a/dive.h +++ b/dive.h @@ -92,8 +92,11 @@ typedef struct { const char *description; /* "integrated", "belt", "ankle" */ } weightsystem_t; -extern int cylinder_none(void *_data); -extern int weightsystem_none(void *_data); +extern gboolean cylinder_none(void *_data); +extern gboolean no_cylinders(cylinder_t *cyl); +extern gboolean cylinders_equal(cylinder_t *cyl1, cylinder_t *cyl2); +extern gboolean no_weightsystems(weightsystem_t *ws); +extern gboolean weightsystems_equal(weightsystem_t *ws1, weightsystem_t *ws2); extern int get_pressure_units(unsigned int mb, const char **units); extern double get_depth_units(unsigned int mm, int *frac, const char **units); -- cgit v1.2.3-70-g09d2