Return an indication that the config file could not be loaded
for processes that want to differentiate this from empty config
Signed-off-by: Justin Mitchell <jumitche@xxxxxxxxxx>
---
support/include/conffile.h | 2 +-
support/nfs/conffile.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/support/include/conffile.h b/support/include/conffile.h
index ad20067..6baaf9a 100644
--- a/support/include/conffile.h
+++ b/support/include/conffile.h
@@ -60,7 +60,7 @@ extern _Bool conf_get_bool(const char *, const char *, _Bool);
extern char *conf_get_str(const char *, const char *);
extern char *conf_get_str_with_def(const char *, const char *, char *);
extern char *conf_get_section(const char *, const char *, const char *);
-extern void conf_init_file(const char *);
+extern int conf_init_file(const char *);
extern void conf_cleanup(void);
extern int conf_match_num(const char *, const char *, int);
extern int conf_remove(int, const char *, const char *);
diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
index 5fb58ea..e65caaf 100644
--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -547,7 +547,7 @@ static void conf_free_bindings(void)
}
/* Open the config file and map it into our address space, then parse it. */
-static void
+static int
conf_load_file(const char *conf_file)
{
int trans;
@@ -557,7 +557,7 @@ conf_load_file(const char *conf_file)
conf_data = conf_readfile(conf_file);
if (conf_data == NULL)
- return;
+ return 1;
/* Load default configuration values. */
conf_load_defaults();
@@ -575,10 +575,10 @@ conf_load_file(const char *conf_file)
/* Apply the new configuration values */
conf_end(trans, 1);
- return;
+ return 0;
}
-void
+int
conf_init_file(const char *conf_file)
{
unsigned int i;
@@ -589,7 +589,7 @@ conf_init_file(const char *conf_file)
TAILQ_INIT (&conf_trans_queue);
if (conf_file == NULL) conf_file=NFS_CONFFILE;
- conf_load_file(conf_file);
+ return conf_load_file(conf_file);
}
/*
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
