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

Removed duplicated method.

Browse source 
This patch removes a duplicated method: get_divenr and
get_index_for_dive. The two are exactly the same  ( if my
c is not broken, but I may be broken since I'm working like
crazy for almost 30h nonstop. ), so please take a good look
before applying this one.

[Dirk Hohndel: Tomaz took the slightly broken of the two implementations,
               so I switched that out for the correct one]

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-11-16 19:21:54 -02:00 • committed by Dirk Hohndel
parent ad0aa8cc49
commit 314cf4c628
4 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
divelist.c
View file

@ -368,10 +368,12 @@ static void add_dive_to_deco(struct dive *dive)
int get_divenr(struct dive *dive)
{
int divenr = -1;
while (++divenr < dive_table.nr && get_dive(divenr) != dive)
;
return divenr;
int i;
struct dive *d;
for_each_dive(i, d)
if (d == dive)
return i;
return -1;
}
static struct gasmix air = { .o2.permille = O2_IN_AIR };
@ -787,8 +789,8 @@ struct dive *merge_two_dives(struct dive *a, struct dive *b)
if (!a || !b)
return NULL;
i = get_index_for_dive(a);
j = get_index_for_dive(b);
i = get_divenr(a);
j = get_divenr(b);
res = merge_dives(a, b, b->when - a->when, FALSE);
if (!res)
return NULL;