diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-09-08 21:15:41 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-09-08 21:15:54 +0100 |
commit | bb056e55b1374a72ed7784a461d027fbd6360b40 (patch) | |
tree | 160ec9e564197efb65e4115e3907094fdc75ba6e /utils/nsoption.c | |
parent | 8b88e440905708ad9354fb72afff206d6208a760 (diff) | |
download | netsurf-bb056e55b1374a72ed7784a461d027fbd6360b40.tar.gz netsurf-bb056e55b1374a72ed7784a461d027fbd6360b40.tar.bz2 |
Sort out the logging so that -v etc do the right thing
Diffstat (limited to 'utils/nsoption.c')
-rw-r--r-- | utils/nsoption.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/nsoption.c b/utils/nsoption.c index 15f89ca5d..09529a0d0 100644 --- a/utils/nsoption.c +++ b/utils/nsoption.c @@ -187,7 +187,7 @@ static void nsoption_validate(struct nsoption_s *opts, struct nsoption_s *defs) break; } } - if (black == true) { + if (black == true && defs != NULL) { for (cloop = NSOPTION_SYS_COLOUR_START; cloop <= NSOPTION_SYS_COLOUR_END; cloop++) { @@ -209,6 +209,9 @@ static void nsoption_validate(struct nsoption_s *opts, struct nsoption_s *defs) opts[NSOPTION_max_retried_fetches].value.u) > 60) && (opts[NSOPTION_max_retried_fetches].value.u > 1)) opts[NSOPTION_max_retried_fetches].value.u--; + + /* We ignore the result because we can't fail to validate. Yay */ + (void)nslog_set_filter_by_options(); } /** @@ -820,6 +823,8 @@ nsoption_commandline(int *pargc, char **argv, struct nsoption_s *opts) } *pargc -= (idx - 1); + nsoption_validate(opts, nsoptions_default); + return NSERROR_OK; } |