diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2017-02-04 17:55:25 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-05 12:29:51 -0800 |
| commit | 0277d5aacc27893220c5914778896d2b4d14aa82 (patch) | |
| tree | bab2fae1f52703d437e7763cdac5e12c2ef0fd7e /core/load-git.c | |
| parent | 12c33a038f1e2f33b7b0e09e0394684115e630ea (diff) | |
| download | subsurface-0277d5aacc27893220c5914778896d2b4d14aa82.tar.gz | |
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>
Diffstat (limited to 'core/load-git.c')
| -rw-r--r-- | core/load-git.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/load-git.c b/core/load-git.c index 2b5163b70..d2379e8d4 100644 --- a/core/load-git.c +++ b/core/load-git.c @@ -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) |