mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Assign the uniq dive ID the moment a dive is allocated

Browse source 
Previously we only did this when we did fixup_dive(), but that way we
can't reference dives "early" in their life cycle (e.g., right after they
got downloaded).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-19 06:53:28 +09:00
parent cae51ff0aa
commit b36c8f07c7
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dive.c
View file

@ -221,6 +221,7 @@ struct dive *alloc_dive(void)
if (!dive) if (!dive)
exit(1); exit(1);
memset(dive, 0, sizeof(*dive)); memset(dive, 0, sizeof(*dive));
dive->id = dive_getUniqID(dive);
return dive; return dive;
} }
@ -955,6 +956,9 @@ struct dive *fixup_dive(struct dive *dive)
weightsystem_t *ws = dive->weightsystem + i; weightsystem_t *ws = dive->weightsystem + i;
add_weightsystem_description(ws); add_weightsystem_description(ws);
} }
/* we should always have a uniq ID as that gets assigned during alloc_dive(),
* but we want to make sure... */
if (!dive->id)
dive->id = dive_getUniqID(dive); dive->id = dive_getUniqID(dive);
return dive; return dive;