X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse.c;h=bbe1a68caaf243fce4c6f45a3c7171410ec30969;hb=414565e000d24fe8b483294fbec64539e336bb4e;hp=7595ef529b1dde708bb55d845759512ff0a1b3da;hpb=ee35716ec72e258897f69e5a22400bc52c51716d;p=ext%2Fsubsurface.git diff --git a/parse.c b/parse.c index 7595ef5..bbe1a68 100644 --- a/parse.c +++ b/parse.c @@ -104,14 +104,31 @@ static void record_dive(struct dive *dive) printf("Recording dive %d with %d samples\n", ++nr, dive->samples); } +static void nonmatch(const char *type, const char *fullname, const char *name, int size, const char *buffer) +{ + printf("Unable to match %s '(%.*s)%s' (%.*s)\n", type, + (int) (name - fullname), fullname, name, + size, buffer); +} + +static const char *last_part(const char *name) +{ + const char *p = strrchr(name, '.'); + return p ? p+1 : name; +} + /* We're in samples - try to convert the random xml value to something useful */ static void try_to_fill_sample(struct sample *sample, const char *name, int size, const char *buffer) { + const char *last = last_part(name); + nonmatch("sample", name, last, size, buffer); } /* We're in the top-level dive xml. Try to convert whatever value to a dive value */ static void try_to_fill_dive(struct dive *dive, const char *name, int size, const char *buffer) { + const char *last = last_part(name); + nonmatch("dive", name, last, size, buffer); } /*