diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-10-18 19:49:18 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-10-18 19:50:29 +0200 |
commit | b33fa02b2d82249bce95239bc40732e7f162f409 (patch) | |
tree | c9764127277f00cf43da0b0e16bd91a0df46659d | |
parent | 2ff48e981e6cd1ccbfae49943274d9c8319a5e5d (diff) | |
download | systemd-b33fa02b2d82249bce95239bc40732e7f162f409.tar.gz |
util: drop const_int_one/const_int_zero again
There's only a single user remaining now that we have setsockopt_int(),
let's define those variables locally.
This more or less reverts 6d5e65f6454212cd400d0ebda34978a9f20cc26a.
-rw-r--r-- | src/basic/util.c | 3 | ||||
-rw-r--r-- | src/basic/util.h | 3 | ||||
-rw-r--r-- | src/udev/udev-rules.c | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index c4c66cca53..0da963f4af 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -51,9 +51,6 @@ int saved_argc = 0; char **saved_argv = NULL; static int saved_in_initrd = -1; -const int const_int_zero = 0; -const int const_int_one = 1; - size_t page_size(void) { static thread_local size_t pgsz = 0; long r; diff --git a/src/basic/util.h b/src/basic/util.h index 32d9380bd9..8cba4ed726 100644 --- a/src/basic/util.h +++ b/src/basic/util.h @@ -232,6 +232,3 @@ int version(void); int str_verscmp(const char *s1, const char *s2); void disable_coredumps(void); - -extern const int const_int_zero; -extern const int const_int_one; diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 752e17f2ae..7ffaf15920 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1392,12 +1392,14 @@ static void add_rule(struct udev_rules *rules, char *line, rule_add_key(&rule_tmp, TK_A_DB_PERSIST, op, NULL, NULL); pos = strstr(value, "nowatch"); - if (pos) - rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &const_int_zero); - else { + if (pos) { + static const int zero = 0; + rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &zero); + } else { + static const int one = 1; pos = strstr(value, "watch"); if (pos) - rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &const_int_one); + rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &one); } pos = strstr(value, "static_node="); |