mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove 'when_from_file' field from dive trip

Browse source 
It had become a write-only field (apart from some now useless debugging)
when simplifying the remove_autogen_trips() function.

So remove it.

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-25 19:09:04 -08:00 committed by Dirk Hohndel
parent 544a8b9d77
commit 85f0749c85
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -275,7 +275,6 @@ extern const char *tripflag_names[NUM_TRIPFLAGS];
typedef struct dive_trip { typedef struct dive_trip {
tripflag_t tripflag; tripflag_t tripflag;
timestamp_t when; timestamp_t when;
timestamp_t when_from_file;
char *location; char *location;
char *notes; char *notes;
struct dive *dives; struct dive *dives;

13
divelist.c
View file

@ -949,11 +949,6 @@ static void dump_trip_list(void)
++i, dive_trip->location, ++i, dive_trip->location,
tm.tm_year + 1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
dive_trip->nrdives, dive_trip); dive_trip->nrdives, dive_trip);
if (dive_trip->when_from_file && dive_trip->when != dive_trip->when_from_file) {
utc_mkdate(dive_trip->when_from_file, &tm);
printf("originally on %04u-%02u-%02u %02u:%02u:%02u\n", tm.tm_year + 1900,
tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
}
last_time = dive_trip->when; last_time = dive_trip->when;
} }
printf("-----\n"); printf("-----\n");
@ -1609,7 +1604,6 @@ static void merge_dive_into_trip_above_cb(GtkWidget *menuitem, GtkTreePath *path
add_dive_to_trip(dive, prev_dive->divetrip); add_dive_to_trip(dive, prev_dive->divetrip);
/* we intentionally changed the dive_trip, so update the time /* we intentionally changed the dive_trip, so update the time
* stamp that we fall back to when toggling autogroup */ * stamp that we fall back to when toggling autogroup */
dive->divetrip->when_from_file = dive->divetrip->when;
dive->tripflag = IN_TRIP; dive->tripflag = IN_TRIP;
free(move_dive_between_trips(&dive_iter, NULL, &trip_iter, NULL, TRUE)); free(move_dive_between_trips(&dive_iter, NULL, &trip_iter, NULL, TRUE));
prev_dive = dive; prev_dive = dive;
@ -1636,7 +1630,6 @@ static void turn_dive_into_trip(GtkTreePath *path)
char *location; char *location;
int idx; int idx;
struct dive *dive; struct dive *dive;
dive_trip_t *dive_trip;
/* this is a dive on the top level, insert trip AFTER it, populate its date / location, and /* this is a dive on the top level, insert trip AFTER it, populate its date / location, and
* then move the dive below that trip */ * then move the dive below that trip */
@ -1651,10 +1644,7 @@ static void turn_dive_into_trip(GtkTreePath *path)
treepath = gtk_tree_model_get_path(MODEL(dive_list), newiter); treepath = gtk_tree_model_get_path(MODEL(dive_list), newiter);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath);
dive = get_dive(idx); dive = get_dive(idx);
/* this trip is intentionally created so it should be treated as if create_and_hookup_trip_from_dive(dive);
* it was read from a file */
dive_trip = create_and_hookup_trip_from_dive(dive);
dive_trip->when_from_file = dive_trip->when;
free(newiter); free(newiter);
} }
@ -1702,7 +1692,6 @@ static void insert_trip_before(GtkTreePath *path)
break; break;
} }
/* treat this divetrip as if it had been read from a file */ /* treat this divetrip as if it had been read from a file */
new_divetrip->when_from_file = new_divetrip->when;
treepath = gtk_tree_model_get_path(MODEL(dive_list), &newparent); treepath = gtk_tree_model_get_path(MODEL(dive_list), &newparent);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath); gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dive_list.tree_view), treepath);
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP

4
parse-xml.c
View file

@ -1201,10 +1201,8 @@ static void try_to_fill_trip(dive_trip_t **dive_trip_p, const char *name, char *
if (MATCH(".date", divedate, &dive_trip->when)) if (MATCH(".date", divedate, &dive_trip->when))
return; return;
if (MATCH(".time", divetime, &dive_trip->when)) { if (MATCH(".time", divetime, &dive_trip->when))
dive_trip->when_from_file = dive_trip->when;
return; return;
}
if (MATCH(".location", utf8_string, &dive_trip->location)) if (MATCH(".location", utf8_string, &dive_trip->location))
return; return;
if (MATCH(".notes", utf8_string, &dive_trip->notes)) if (MATCH(".notes", utf8_string, &dive_trip->notes))