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

rename 'get_dive_by_diveid' to 'get_dive_by_uemis_diveid'

Browse source 
A bit longer, but we had a function named get_dive_by_diveid
and another one named getDiveByDiveid that did completely
different things, it was too easy to hit the wrong one..

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-05-12 14:10:13 -03:00 • committed by Dirk Hohndel
parent 6ab05563b3
commit e1971e9425
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dive.h
View file

@ -421,7 +421,7 @@ static inline struct divecomputer *get_dive_dc(struct dive *dive, int nr)
#define for_each_gps_location(_i, _x) \
for ((_i) = 0; ((_x) = get_gps_location(_i, &gps_location_table)) != NULL; (_i)++)
static inline struct dive *get_dive_by_diveid(uint32_t diveid, uint32_t deviceid)
static inline struct dive *get_dive_by_uemis_diveid(uint32_t diveid, uint32_t deviceid)
{
int i;
struct dive *dive;
@ -435,10 +435,7 @@ static inline struct dive *get_dive_by_diveid(uint32_t diveid, uint32_t deviceid
}
return NULL;
}
// this is very different from get_dive_by_diveid() (which is only used
// by the UEMIS downloader) -- this uses the unique diveID to allow us
// to hold an identifier for a dive across operations that might change
// the dive_table
static inline struct dive *getDiveById(int id)
{
int i;

2
uemis-downloader.c
View file

@ -751,7 +751,7 @@ static bool process_raw_buffer(uint32_t deviceid, char *inbuf, char **max_divenr
dive->number = atoi(val);
} else if (!log && !strcmp(tag, "logfilenr")) {
/* this one tells us which dive we are adding data to */
dive = get_dive_by_diveid(atoi(val), deviceid);
dive = get_dive_by_uemis_diveid(atoi(val), deviceid);
if (for_dive)
*for_dive = atoi(val);
} else if (!log && dive && !strcmp(tag, "divespot_id")) {