diff options
| author | Jon Lund Steffensen <jonlst@gmail.com> | 2013-12-09 11:07:47 -0500 |
|---|---|---|
| committer | Jon Lund Steffensen <jonlst@gmail.com> | 2013-12-09 12:28:45 -0500 |
| commit | e4034ba27de725e0fa9b6c4de8f32ca7ad0193a3 (patch) | |
| tree | c550355d8a93ae92a7bd7847a3001218c616270d /src/location-manual.c | |
| parent | Constify gamma parameter to set_temperature() methods (diff) | |
| download | redshift-ng-e4034ba27de725e0fa9b6c4de8f32ca7ad0193a3.tar.gz redshift-ng-e4034ba27de725e0fa9b6c4de8f32ca7ad0193a3.tar.bz2 redshift-ng-e4034ba27de725e0fa9b6c4de8f32ca7ad0193a3.tar.xz | |
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".
Diffstat (limited to 'src/location-manual.c')
| -rw-r--r-- | src/location-manual.c | 9 |
1 files changed, 2 insertions, 7 deletions
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; |