[PATCH] fixup_dive(): move the add_* calls before a possible return
Lubomir I. Ivanov
neolit123 at gmail.com
Tue Oct 2 07:56:12 PDT 2012
From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
In dive.c:fixup_dive() it would be better to call functions
like add_people() and add_location() before the possible return
in the "if (end < 0)" branch.
This prevents a partial auto-complete list in "Dive Info"
combo boxes.
Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
dive.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dive.c b/dive.c
index 092153d..641e1ed 100644
--- a/dive.c
+++ b/dive.c
@@ -384,6 +384,10 @@ struct dive *fixup_dive(struct dive *dive)
int lasttemp = 0, lastpressure = 0;
int pressure_delta[MAX_CYLINDERS] = {INT_MAX, };
+ add_people(dive->buddy);
+ add_people(dive->divemaster);
+ add_location(dive->location);
+ add_suit(dive->suit);
sanitize_cylinder_info(dive);
for (i = 0; i < dive->samples; i++) {
struct sample *sample = dive->sample + i;
@@ -496,10 +500,6 @@ struct dive *fixup_dive(struct dive *dive)
update_temperature(&dive->watertemp, mintemp);
update_depth(&dive->maxdepth, maxdepth);
- add_people(dive->buddy);
- add_people(dive->divemaster);
- add_location(dive->location);
- add_suit(dive->suit);
for (i = 0; i < MAX_CYLINDERS; i++) {
cylinder_t *cyl = dive->cylinder + i;
add_cylinder_description(&cyl->type);
--
1.7.11.msysgit.0
More information about the subsurface
mailing list