From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 16 May 2016 12:55:28 +0000 (+0200)
Subject: dss: Make argument of parse_config_file() a boolean.
X-Git-Tag: v0.1.7~11
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ce9d8dbb002447f4a7de548a1e3fe3ec5ead73b6;p=dss.git

dss: Make argument of parse_config_file() a boolean.

It is used as such, so there is no point to have an int here. Also
rename the argument from override to sighup to indicate that we
need to distinguish whether the function is called at startup or
because the dss process received SIGHUP.
---

diff --git a/dss.c b/dss.c
index a50a3de..5f7cfe0 100644
--- a/dss.c
+++ b/dss.c
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <ctype.h>
+#include <stdbool.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <inttypes.h>
@@ -977,7 +978,7 @@ static int check_config(void)
  * Returns < 0 on errors, 0 if no config file is given and > 0 if the config
  * file was read successfully.
  */
-static int parse_config_file(int override)
+static int parse_config_file(bool sighup)
 {
 	int ret, config_file_exists;
 	char *config_file = get_config_file_name();
@@ -985,7 +986,7 @@ static int parse_config_file(int override)
 	char *old_logfile_arg = NULL;
 	int old_daemon_given = 0;
 
-	if (override) { /* SIGHUP */
+	if (sighup) {
 		if (conf.logfile_given)
 			old_logfile_arg = dss_strdup(conf.logfile_arg);
 		old_daemon_given = conf.daemon_given;
@@ -999,12 +1000,12 @@ static int parse_config_file(int override)
 	}
 	if (config_file_exists) {
 		struct cmdline_parser_params params;
-		params.override = override;
+		params.override = sighup;
 		params.initialize = 0;
 		params.check_required = 1;
 		params.check_ambiguity = 0;
 		params.print_errors = 1;
-		if (override) { /* invalidate all rsync options */
+		if (sighup) { /* invalidate all rsync options */
 			int i;
 
 			for (i = 0; i < conf.rsync_option_given; i++) {
@@ -1018,7 +1019,7 @@ static int parse_config_file(int override)
 	ret = check_config();
 	if (ret < 0)
 		goto out;
-	if (override) {
+	if (sighup) {
 		/* don't change daemon mode on SIGHUP */
 		conf.daemon_given = old_daemon_given;
 		close_log(logfile);
@@ -1055,7 +1056,7 @@ static int handle_sighup(void)
 
 	DSS_NOTICE_LOG(("SIGHUP, re-reading config\n"));
 	dump_dss_config("old");
-	ret = parse_config_file(1);
+	ret = parse_config_file(true /* SIGHUP */);
 	if (ret < 0)
 		return ret;
 	dump_dss_config("reloaded");
@@ -1506,6 +1507,7 @@ int main(int argc, char **argv)
 
 	cmdline_parser_ext(argc, argv, &conf, &params); /* aborts on errors */
 	ret = parse_config_file(0);
+	ret = parse_config_file(false /* no SIGHUP */);
 	if (ret < 0)
 		goto out;
 	if (ret == 0) { /* no config file given */