changeset 4e5931455631 in /srv/hg/libpwquality details: http://hg.fedorahosted.org/hg/srv/hg/libpwquality?cmd=changeset;node=4e59314... summary: Refactor out parsing of a single configuration file.
diffstat:
src/settings.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-)
diffs (44 lines):
diff -r fa2fa075c8b7 -r 4e5931455631 src/settings.c --- a/src/settings.c Thu Jul 16 13:58:58 2015 +0200 +++ b/src/settings.c Fri Jul 17 14:20:51 2015 +0200 @@ -99,19 +99,14 @@
#define PWQSETTINGS_MAX_LINELEN 1023
-/* parse the configuration file (if NULL then the default one) */ +/* parse a single configuration file*/ int -pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror) +read_config_file(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror) { FILE *f; char linebuf[PWQSETTINGS_MAX_LINELEN+1]; int rv = 0;
- if (auxerror) - *auxerror = NULL; - if (cfgfile == NULL) - cfgfile = PWQUALITY_DEFAULT_CFGFILE; - f = fopen(cfgfile, "r"); if (f == NULL) { /* ignore non-existent default config file */ @@ -186,6 +181,18 @@ return rv; }
+/* parse the configuration file (if NULL then the default one) */ +int +pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror) +{ + if (auxerror) + *auxerror = NULL; + if (cfgfile == NULL) + cfgfile = PWQUALITY_DEFAULT_CFGFILE; + + return read_config_file(pwq, cfgfile, auxerror); +} + /* useful for setting the options as configured on a pam module * command line in form of <opt>=<val> */ int