65 lines
2.8 KiB
Diff
65 lines
2.8 KiB
Diff
From 2878f90d6f50e7243038f4b1221654f18b2bd475 Mon Sep 17 00:00:00 2001
|
|
From: Paul Crawford <psc@sat.dundee.ac.uk>
|
|
Date: Fri, 30 Dec 2016 16:01:15 +0000
|
|
Subject: [PATCH 05/10] Rename READ_ENUM to READ_YESNO
|
|
|
|
- Previously we only has a single enumerated choice - the Boolean
|
|
yes/no option in the config file.
|
|
|
|
- In preparation for having yes/no/auto we should make this more
|
|
obvious.
|
|
---
|
|
src/configfile.c | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/configfile.c b/src/configfile.c
|
|
index 10bbc69..809e39a 100644
|
|
--- a/src/configfile.c
|
|
+++ b/src/configfile.c
|
|
@@ -128,7 +128,7 @@ READ_LIST_END()
|
|
|
|
#define READ_INT(name, iv) read_int_func( arg, val, name, 0, 0, iv)
|
|
#define READ_STRING(name, str) read_string_func( arg, val, name, Read_allow_blank, str)
|
|
-#define READ_ENUM(name, iv) read_enumerated_func(arg, val, name, Yes_No_list, iv)
|
|
+#define READ_YESNO(name, iv) read_enumerated_func(arg, val, name, Yes_No_list, iv)
|
|
#define READ_LIST(name, list) read_list_func( arg, val, name, 0, list)
|
|
|
|
/*
|
|
@@ -195,7 +195,7 @@ void read_config(char *configfile)
|
|
} else if (READ_INT(PINGCOUNT, &pingcount) == 0) {
|
|
} else if (READ_LIST(PING, &target_list) == 0) {
|
|
} else if (READ_LIST(INTERFACE, &iface_list) == 0) {
|
|
- } else if (READ_ENUM(REALTIME, &realtime) == 0) {
|
|
+ } else if (READ_YESNO(REALTIME, &realtime) == 0) {
|
|
} else if (READ_INT(PRIORITY, &schedprio) == 0) {
|
|
} else if (READ_STRING(REPAIRBIN, &repair_bin) == 0) {
|
|
} else if (READ_INT(REPAIRTIMEOUT, &repair_timeout) == 0) {
|
|
@@ -208,7 +208,7 @@ void read_config(char *configfile)
|
|
} else if (READ_INT(LOGTICK, &logtick) == 0) {
|
|
ticker = logtick;
|
|
} else if (READ_STRING(DEVICE, &devname) == 0) {
|
|
- } else if (READ_ENUM(DEVICE_USE_SETTIMEOUT, &refresh_use_settimeout) == 0) {
|
|
+ } else if (READ_YESNO(DEVICE_USE_SETTIMEOUT, &refresh_use_settimeout) == 0) {
|
|
} else if (READ_INT(DEVICE_TIMEOUT, &dev_timeout) == 0) {
|
|
} else if (READ_LIST(TEMP, &temp_list) == 0) {
|
|
} else if (READ_INT(MAXTEMP, &maxtemp) == 0) {
|
|
@@ -219,12 +219,12 @@ void read_config(char *configfile)
|
|
} else if (READ_INT(ALLOCMEM, &minalloc) == 0) {
|
|
} else if (READ_STRING(LOGDIR, &logdir) == 0) {
|
|
} else if (READ_STRING(TESTDIR, &test_dir) == 0) {
|
|
- } else if (READ_ENUM(SOFTBOOT, &softboot) == 0) {
|
|
- } else if (READ_ENUM(TEMPPOWEROFF, &temp_poweroff) == 0) {
|
|
+ } else if (READ_YESNO(SOFTBOOT, &softboot) == 0) {
|
|
+ } else if (READ_YESNO(TEMPPOWEROFF, &temp_poweroff) == 0) {
|
|
} else if (READ_INT(SIGTERM_DELAY, &sigterm_delay) == 0) {
|
|
} else if (READ_INT(RETRYTIMEOUT, &retry_timeout) == 0) {
|
|
} else if (READ_INT(REPAIRMAX, &repair_max) == 0) {
|
|
- } else if (READ_ENUM(VERBOSE, &verbose) == 0) {
|
|
+ } else if (READ_YESNO(VERBOSE, &verbose) == 0) {
|
|
} else {
|
|
log_message(LOG_WARNING, "Ignoring invalid option at line %d of config file: %s=%s", linecount, arg, val);
|
|
}
|
|
--
|
|
2.20.1
|
|
|