mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 20:33:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: rename trip->index to trip->saved

Browse source 
The index-field was misused by the IO routines to mark which dives
had been saved. Somewhat questionable, but let's at least name the
field accordingly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-07-18 08:01:25 +02:00 • committed by Dirk Hohndel
parent 3a933637da
commit 8ff7314b21
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/dive.h
View file

@ -294,7 +294,8 @@ typedef struct dive_trip
char *notes;
struct dive *dives;
int nrdives;
int index;
/* Used by the io-routines to mark trips that have already been written. */
bool saved;
unsigned expanded : 1, selected : 1, autogen : 1, fixup : 1;
struct dive_trip *next;
} dive_trip_t;

6
core/save-git.c
View file

@ -954,7 +954,7 @@ static int create_git_tree(git_repository *repo, struct dir *root, bool select_o
save_divesites(repo, root);
for (trip = dive_trip_list; trip != NULL; trip = trip->next)
trip->index = 0;
trip->saved = 0;
/* save the dives */
git_storage_update_progress(translate("gettextFromC", "Start saving dives"));
@ -979,9 +979,9 @@ static int create_git_tree(git_repository *repo, struct dir *root, bool select_o
if (trip) {
/* Did we already save this trip? */
if (trip->index)
if (trip->saved)
continue;
trip->index = 1;
trip->saved = 1;
/* Pass that new subdirectory in for save-trip */
save_one_trip(repo, tree, trip, &tm, cached_ok);

6
core/save-html.c
View file

@ -435,17 +435,17 @@ void write_trips(struct membuffer *b, const char *photos_dir, bool selected_only
char *sep = &sep_;
for (trip = dive_trip_list; trip != NULL; trip = trip->next)
trip->index = 0;
trip->saved = 0;
for_each_dive (i, dive) {
trip = dive->divetrip;
/*Continue if the dive have no trips or we have seen this trip before*/
if (!trip || trip->index)
if (!trip || trip->saved)
continue;
/* We haven't seen this trip before - save it and all dives */
trip->index = 1;
trip->saved = 1;
write_trip(b, trip, &dive_no, selected_only, photos_dir, list_only, sep);
}

6
core/save-xml.c
View file

@ -625,7 +625,7 @@ void save_dives_buffer(struct membuffer *b, const bool select_only)
}
put_format(b, "</divesites>\n<dives>\n");
for (trip = dive_trip_list; trip != NULL; trip = trip->next)
trip->index = 0;
trip->saved = 0;
/* save the dives */
for_each_dive(i, dive) {
@ -645,11 +645,11 @@ void save_dives_buffer(struct membuffer *b, const bool select_only)
}
/* Have we already seen this trip (and thus saved this dive?) */
if (trip->index)
if (trip->saved)
continue;
/* We haven't seen this trip before - save it and all dives */
trip->index = 1;
trip->saved = 1;
save_trip(b, trip);
}
}