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

Simplify tripflags: remove tripflag_names[]

Browse source 
This removes the tripflag name array, since it's not actually useful.
The only information we ever save in the XML file is whether a dive is
explicitly not supposed to ever be grouped with a trip ("NOTRIP"), and
everything else is implicit.

I'm going to simplify the trip flags further (possibly removing it
entirely - like I did for dive trips already), and don't like having to
maintain the tripflag_names[] array logic.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2012-11-26 14:52:07 -08:00 • committed by Dirk Hohndel
parent 3f197336aa
commit 6fe52ee19e
4 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -270,7 +270,6 @@ struct divecomputer {
#define W_IDX_SECONDARY 1 #define W_IDX_SECONDARY 1
typedef enum { TF_NONE, NO_TRIP, IN_TRIP, ASSIGNED_TRIP, NUM_TRIPFLAGS } tripflag_t; typedef enum { TF_NONE, NO_TRIP, IN_TRIP, ASSIGNED_TRIP, NUM_TRIPFLAGS } tripflag_t;
extern const char *tripflag_names[NUM_TRIPFLAGS];
typedef struct dive_trip { typedef struct dive_trip {
timestamp_t when; timestamp_t when;

5
divelist.c
View file

@ -43,11 +43,6 @@ static struct DiveList dive_list;
dive_trip_t *dive_trip_list; dive_trip_t *dive_trip_list;
gboolean autogroup = FALSE; gboolean autogroup = FALSE;
/* this duplicate assignment of "INTRIP" causes the save_xml code
* to convert an ASSIGNED_TRIP (which is temporary in memory) to
* a statically assigned trip (INTRIP) in file */
const char *tripflag_names[NUM_TRIPFLAGS] = { "TF_NONE", "NOTRIP", "INTRIP", "INTRIP" };
/* /*
* The dive list has the dive data in both string format (for showing) * The dive list has the dive data in both string format (for showing)
* and in "raw" format (for sorting purposes) * and in "raw" format (for sorting purposes)

10
parse-xml.c
View file

@ -533,14 +533,8 @@ static void hex_value(char *buffer, void *_i)
static void get_tripflag(char *buffer, void *_tf) static void get_tripflag(char *buffer, void *_tf)
{ {
tripflag_t *tf = _tf; tripflag_t *tf = _tf;
tripflag_t i; *tf = strcmp(buffer, "NOTRIP") ? TF_NONE : NO_TRIP;
free(buffer);
*tf = TF_NONE;
for (i = NO_TRIP; i < NUM_TRIPFLAGS; i++)
if(! strcmp(buffer, tripflag_names[i])) {
*tf = i;
break;
}
} }
static void centibar(char *buffer, void *_pressure) static void centibar(char *buffer, void *_pressure)

10
save-xml.c
View file

@ -373,14 +373,8 @@ static void save_dive(FILE *f, struct dive *dive)
fputs("<dive", f); fputs("<dive", f);
if (dive->number) if (dive->number)
fprintf(f, " number='%d'", dive->number); fprintf(f, " number='%d'", dive->number);
/* if (dive->tripflag == NO_TRIP)
* TF_NONE is the default for dives with no trips fprintf(f, " tripflag='NOTRIP'");
* IN_TRIP is the default for dives with trips
* ASSIGNED_TRIP is an in-memory thing and gets converted
* to IN_TRIP by the save code.
*/
if (dive->tripflag != TF_NONE && dive->tripflag != IN_TRIP && dive->tripflag != ASSIGNED_TRIP)
fprintf(f, " tripflag='%s'", tripflag_names[dive->tripflag]);
if (dive->rating) if (dive->rating)
fprintf(f, " rating='%d'", dive->rating); fprintf(f, " rating='%d'", dive->rating);
if (dive->visibility) if (dive->visibility)