Merge informational_prefs into git_prefs

There is no need to have two variables for the same purpose.

[Dirk Hohndel: changed to keep the two separate functions as otherwise
               we no longer parse existing repos successfully]

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2017-02-04 17:55:25 +01:00 committed by Dirk Hohndel
parent 12c33a038f
commit 0277d5aacc
5 changed files with 39 additions and 26 deletions

View file

@ -996,7 +996,7 @@ static void trip_parser(char *line, struct membuffer *str, void *_trip)
static struct keyword_action settings_action[] = {
#undef D
#define D(x) { #x, parse_settings_ ## x }
D(autogroup), D(divecomputerid), D(subsurface), D(prefs), D(units), D(userid), D(version)
D(autogroup), D(divecomputerid), D(prefs), D(subsurface), D(units), D(userid), D(version)
};
static void settings_parser(char *line, struct membuffer *str, void *_unused)