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

Convert the divelist debug helpers to the new time functions as well

Browse source 
This makes things consistent.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-09-20 13:08:50 -07:00
parent 49948e205b
commit 4b42c54357
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
divelist.c
View file

@ -957,17 +957,18 @@ static void dump_trip_list(void)
timestamp_t last_time = 0; timestamp_t last_time = 0;
while ((p = NEXT_TRIP(p))) { while ((p = NEXT_TRIP(p))) {
dive_trip_t *dive_trip = DIVE_TRIP(p); dive_trip_t *dive_trip = DIVE_TRIP(p);
struct tm *tm = gmtime(&dive_trip->when); struct tm tm;
utc_mkdate(dive_trip->when, &tm);
if (dive_trip->when < last_time) if (dive_trip->when < last_time)
printf("\n\ndive_trip_list OUT OF ORDER!!!\n\n\n"); printf("\n\ndive_trip_list OUT OF ORDER!!!\n\n\n");
printf("%s trip %d to \"%s\" on %04u-%02u-%02u %02u:%02u:%02u\n", printf("%s trip %d to \"%s\" on %04u-%02u-%02u %02u:%02u:%02u\n",
dive_trip->tripflag == AUTOGEN_TRIP ? "autogen " : "", dive_trip->tripflag == AUTOGEN_TRIP ? "autogen " : "",
++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);
if (dive_trip->when_from_file && dive_trip->when != dive_trip->when_from_file) { if (dive_trip->when_from_file && dive_trip->when != dive_trip->when_from_file) {
tm = gmtime(&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, 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); 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;
} }
@ -983,11 +984,11 @@ static GList *find_trip(timestamp_t when)
trip = trip->next; trip = trip->next;
if (DIVE_TRIP(trip)->when == when) { if (DIVE_TRIP(trip)->when == when) {
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
struct tm *tm; struct tm tm;
tm = gmtime(&DIVE_TRIP(trip)->when); utc_mkdate(DIVE_TRIP(trip)->when, &tm);
printf("found trip @ %04d-%02d-%02d %02d:%02d:%02d\n", printf("found trip @ %04d-%02d-%02d %02d:%02d:%02d\n",
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
#endif #endif
return trip; return trip;
} }
@ -1011,11 +1012,11 @@ static GList *find_matching_trip(timestamp_t when)
trip = trip->next; trip = trip->next;
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
{ {
struct tm *tm; struct tm tm;
tm = gmtime(&DIVE_TRIP(trip)->when); utc_mkdate(DIVE_TRIP(trip)->when, &tm);
printf("found trip @ %04d-%02d-%02d %02d:%02d:%02d\n", printf("found trip @ %04d-%02d-%02d %02d:%02d:%02d\n",
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);
} }
#endif #endif
return trip; return trip;