nfs-utils: rename xlog_from_conffile() to xlog_set_debug()

Standardized how config setting are set as
well as the rename

Signed-off-by: Steve Dickson <steved@redhat.com>

8 files changed, 43 insertions, 29 deletions

diff --git a/support/include/xlog.h b/support/include/xlog.h
index 32ff5a1b..69cdf61e 100644
--- a/support/include/xlog.h
+++ b/support/include/xlog.h
@@ -51,7 +51,7 @@ void			xlog_stderr(int on);
 void			xlog_syslog(int on);
 void			xlog_config(int fac, int on);
 void			xlog_sconfig(char *, int on);
-void			xlog_from_conffile(char *);
+void			xlog_set_debug(char *);
 int			xlog_enabled(int fac);
 void			xlog(int fac, const char *fmt, ...) XLOG_FORMAT((printf, 2, 3));
 void			xlog_warn(const char *fmt, ...) XLOG_FORMAT((printf, 1, 2));
diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c
index 86acd6ac..e5861b9d 100644
--- a/support/nfs/xlog.c
+++ b/support/nfs/xlog.c
@@ -129,7 +129,7 @@ xlog_sconfig(char *kind, int on)
 }
 
 void
-xlog_from_conffile(char *service)
+xlog_set_debug(char *service)
 {
 	struct conf_list *kinds;
 	struct conf_list_node *n;
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 9fcae0b3..f8b446a4 100644
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -91,7 +91,12 @@ release_lockfile()
 		_lockfd = -1;
 	}
 }
-
+inline static void 
+read_exportfs_conf(void)
+{
+	conf_init_file(NFS_CONFFILE);
+	xlog_set_debug("exportfs");
+}
 int
 main(int argc, char **argv)
 {
@@ -116,8 +121,9 @@ main(int argc, char **argv)
 	xlog_stderr(1);
 	xlog_syslog(0);
 
-	conf_init_file(NFS_CONFFILE);
-	xlog_from_conffile("exportfs");
+	/* Read in config setting */
+	read_exportfs_conf();
+
 	nfsd_path_init();
 
 	/* NOTE: following uses "mountd" section of nfs.conf !!!! */
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index a480265a..612063ba 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -666,13 +666,13 @@ int	port = 0;
 int	descriptors = 0;
 
 inline static void 
-read_mount_conf(char **argv)
+read_mountd_conf(char **argv)
 {
 	char	*s;
 
 	conf_init_file(NFS_CONFFILE);
 
-	xlog_from_conffile("mountd");
+	xlog_set_debug("mountd");
 	manage_gids = conf_get_bool("mountd", "manage-gids", manage_gids);
 	descriptors = conf_get_num("mountd", "descriptors", descriptors);
 	port = conf_get_num("mountd", "port", port);
@@ -684,9 +684,6 @@ read_mount_conf(char **argv)
 	if (s && !state_setup_basedir(argv[0], s))
 		exit(1);
 
-	if ((s = conf_get_str("mountd", "debug")) != NULL)
-		xlog_sconfig(s, 1);
-
 	/* NOTE: following uses "nfsd" section of nfs.conf !!!! */
 	if (conf_get_bool("nfsd", "udp", NFSCTL_UDPISSET(_rpcprotobits)))
 		NFSCTL_UDPSET(_rpcprotobits);
@@ -726,7 +723,7 @@ main(int argc, char **argv)
 	xlog_open(progname);
 
 	/* Read in config setting */
-	read_mount_conf(argv);
+	read_mountd_conf(argv);
 
 	/* Parse the command line options and arguments. */
 	opterr = 0;
diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index c9f0385b..b0741718 100644
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -56,6 +56,13 @@ static struct option longopts[] =
 	{ NULL, 0, 0, 0 }
 };
 
+inline static void 
+read_nfsd_conf(void)
+{
+	conf_init_file(NFS_CONFFILE); 
+	xlog_set_debug("nfsd");
+}
+
 int
 main(int argc, char **argv)
 {
@@ -81,8 +88,8 @@ main(int argc, char **argv)
 	xlog_syslog(0);
 	xlog_stderr(1);
 
-	conf_init_file(NFS_CONFFILE); 
-	xlog_from_conffile("nfsd");
+	/* Read in config setting */
+	read_nfsd_conf();
 
 	nfssvc_get_minormask(&minormask);
 
diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c
index b45a904e..e926f1c0 100644
--- a/utils/nfsdcltrack/nfsdcltrack.c
+++ b/utils/nfsdcltrack/nfsdcltrack.c
@@ -549,12 +549,21 @@ find_cmd(char *cmdname)
 			__func__, cmdname);
 	return NULL;
 }
+inline static void 
+read_nfsdcltrack_conf(void)
+{
+	char *val;
 
+	conf_init_file(NFS_CONFFILE); 
+	xlog_set_debug("nfsdcltrack");
+	val = conf_get_str("nfsdcltrack", "storagedir");
+	if (val)
+		storagedir = val;
+}
 int
 main(int argc, char **argv)
 {
 	int arg;
-	char *val;
 	int rc = 0;
 	char *progname, *cmdarg = NULL;
 	struct cltrack_cmd *cmd;
@@ -564,14 +573,8 @@ main(int argc, char **argv)
 	xlog_syslog(1);
 	xlog_stderr(0);
 
-	conf_init_file(NFS_CONFFILE); 
-	xlog_from_conffile("nfsdcltrack");
-	val = conf_get_str("nfsdcltrack", "storagedir");
-	if (val)
-		storagedir = val;
-	rc = conf_get_num("nfsdcltrack", "debug", 0);
-	if (rc > 0)
-		xlog_config(D_ALL, 1);
+	/* Read in config setting */
+	read_nfsdcltrack_conf();
 
 	/* process command-line options */
 	while ((arg = getopt_long(argc, argv, "hdfs:", longopts,
diff --git a/utils/statd/sm-notify.c b/utils/statd/sm-notify.c
index 739731f5..606b912d 100644
--- a/utils/statd/sm-notify.c
+++ b/utils/statd/sm-notify.c
@@ -482,12 +482,12 @@ nsm_lift_grace_period(void)
 	return;
 }
 inline static void 
-read_nfsconf(char **argv)
+read_smnotify_conf(char **argv)
 {
 	char *s;
 
 	conf_init_file(NFS_CONFFILE);
-	xlog_from_conffile("sm-notify");
+	xlog_set_debug("sm-notify");
 	opt_max_retry = conf_get_num("sm-notify", "retry-time", opt_max_retry / 60) * 60;
 	opt_srcport = conf_get_str("sm-notify", "outgoing-port");
 	opt_srcaddr = conf_get_str("sm-notify", "outgoing-addr");
@@ -512,7 +512,8 @@ main(int argc, char **argv)
 	else
 		progname = argv[0];
 
-	read_nfsconf(argv);
+	/* Read in config setting */
+	read_smnotify_conf(argv);
 
 	while ((c = getopt(argc, argv, "dm:np:v:P:f")) != -1) {
 		switch (c) {
diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index e4a1df43..32169d47 100644
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -243,12 +243,12 @@ int port = 0, out_port = 0;
 int nlm_udp = 0, nlm_tcp = 0;
 
 inline static void 
-read_nfsconf(char **argv)
+read_statd_conf(char **argv)
 {
 	char *s;
 
 	conf_init_file(NFS_CONFFILE);
-	xlog_from_conffile("statd");
+	xlog_set_debug("statd");
 
 	out_port = conf_get_num("statd", "outgoing-port", out_port);
 	port = conf_get_num("statd", "port", port);
@@ -306,8 +306,8 @@ int main (int argc, char **argv)
 	/* Set hostname */
 	MY_NAME = NULL;
 
-	/* Read nfs.conf */
-	read_nfsconf(argv);
+	/* Read in config setting */
+	read_statd_conf(argv);
 
 	/* Process command line switches */
 	while ((arg = getopt_long(argc, argv, "h?vVFNH:dn:p:o:P:LT:U:", longopts, NULL)) != EOF) {