From e4034ba27de725e0fa9b6c4de8f32ca7ad0193a3 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Mon, 9 Dec 2013 11:07:47 -0500 Subject: Do not allow NULL keys when setting options This should fix a bug where command line options for the "manual" location provider cannot override the config file. To keep compatability with previous versions the command line parser will still special case parsing "-l LAT:LON" and set the correct options in "manual". --- src/location-manual.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/location-manual.c') diff --git a/src/location-manual.c b/src/location-manual.c index 11586bb..30dfc9c 100644 --- a/src/location-manual.c +++ b/src/location-manual.c @@ -88,15 +88,10 @@ location_manual_set_option(location_manual_state_t *state, const char *key, return -1; } - if ((key == NULL && isnan(state->lat)) || - (key != NULL && strcasecmp(key, "lat") == 0)) { + if (strcasecmp(key, "lat") == 0) { state->lat = v; - } else if ((key == NULL && isnan(state->lon)) || - (key != NULL && strcasecmp(key, "lon") == 0)) { + } else if (strcasecmp(key, "lon") == 0) { state->lon = v; - } else if (key == NULL) { - fputs(_("Too many arguments.\n"), stderr); - return -1; } else { fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); return -1; -- cgit v1.2.3-70-g09d2