mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't report dives as they are parsed: sort them at the end and report them then

Browse source 
This makes it much easier to see the duplicates, but more importantly,
we do need to actually save the dives off to do any real work with them.

Also, require a verbosity level of 1 (-v) to show all the samples.
While (-vv) shows unparsed entries.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-08-30 17:18:33 -07:00
parent 3bd1abdfc7
commit 048a5a2b32
1 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
parse.c
View file

@ -119,18 +119,35 @@ struct dive {
struct sample sample[]; struct sample sample[];
}; };
static struct dive **dive_table;
static int nr_dives, nr_allocated;
static void record_dive(struct dive *dive) static void record_dive(struct dive *dive)
{
if (nr_dives >= nr_allocated) {
nr_allocated = (nr_dives + 32) * 3 / 2;
dive_table = realloc(dive_table, nr_allocated * sizeof(struct dive *));
if (!dive_table)
exit(1);
}
dive_table[nr_dives++] = dive;
}
static void show_dive(int nr, struct dive *dive)
{ {
int i; int i;
static int nr;
struct tm *tm; struct tm *tm;
tm = gmtime(&dive->when); tm = gmtime(&dive->when);
printf("Dive %d with %d samples at %02d:%02d:%02d %04d-%02d-%02d\n", printf("Dive %d with %d samples at %02d:%02d:%02d %04d-%02d-%02d\n",
++nr, dive->samples, nr, dive->samples,
tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_hour, tm->tm_min, tm->tm_sec,
tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday); tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
if (!verbose)
return;
for (i = 0; i < dive->samples; i++) { for (i = 0; i < dive->samples; i++) {
struct sample *s = dive->sample + i; struct sample *s = dive->sample + i;
@ -143,9 +160,30 @@ static void record_dive(struct dive *dive)
} }
} }
static int sortfn(const void *_a, const void *_b)
{
const struct dive *a = *(void **)_a;
const struct dive *b = *(void **)_b;
if (a->when < b->when)
return -1;
if (a->when > b->when)
return 1;
return 0;
}
static void report_dives(void)
{
int i;
qsort(dive_table, nr_dives, sizeof(struct dive *), sortfn);
for (i = 0; i < nr_dives; i++)
show_dive(i+1, dive_table[i]);
}
static void nonmatch(const char *type, const char *fullname, const char *name, char *buffer) static void nonmatch(const char *type, const char *fullname, const char *name, char *buffer)
{ {
if (verbose) if (verbose > 1)
printf("Unable to match %s '(%.*s)%s' (%s)\n", type, printf("Unable to match %s '(%.*s)%s' (%s)\n", type,
(int) (name - fullname), fullname, name, (int) (name - fullname), fullname, name,
buffer); buffer);
@ -654,5 +692,6 @@ int main(int argc, char **argv)
} }
parse(a); parse(a);
} }
report_dives();
return 0; return 0;
} }