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

Git parser: don't produce user-visible error on git parsing

Browse source 
In 64e6e435f8 the when field of struct
trip was removed. Accordingly it was not read from git repositories.
This produced a large amount of user-visible error messages.

Reinstate the trip-date and time parsing functions, but ignore
the value.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-11-20 12:07:33 +01:00 • committed by Dirk Hohndel
parent 01d031383c
commit da866583fd
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/load-git.c
View file

@ -799,6 +799,14 @@ static void parse_dc_event(char *line, struct membuffer *str, void *_dc)
} }
} }
/* Not needed anymore - trip date calculated implicitly from first dive */
static void parse_trip_date(char *line, struct membuffer *str, void *trip)
{ UNUSED(line); UNUSED(str); UNUSED(trip); }
/* Not needed anymore - trip date calculated implicitly from first dive */
static void parse_trip_time(char *line, struct membuffer *str, void *trip)
{ UNUSED(line); UNUSED(str); UNUSED(trip); }
static void parse_trip_location(char *line, struct membuffer *str, void *_trip) static void parse_trip_location(char *line, struct membuffer *str, void *_trip)
{ UNUSED(line); dive_trip_t *trip = _trip; trip->location = get_utf8(str); } { UNUSED(line); dive_trip_t *trip = _trip; trip->location = get_utf8(str); }
@ -1001,7 +1009,7 @@ static void site_parser(char *line, struct membuffer *str, void *_ds)
struct keyword_action trip_action[] = { struct keyword_action trip_action[] = {
#undef D #undef D
#define D(x) { #x, parse_trip_ ## x } #define D(x) { #x, parse_trip_ ## x }
D(location), D(notes), D(date), D(location), D(notes), D(time),
}; };
static void trip_parser(char *line, struct membuffer *str, void *_trip) static void trip_parser(char *line, struct membuffer *str, void *_trip)