morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 17:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

util: drop const_int_one/const_int_zero again

Browse Source 
There's only a single user remaining now that we have setsockopt_int(),
let's define those variables locally.

This more or less reverts 6d5e65f645.
This commit is contained in:
Lennart Poettering
2018-10-18 19:49:18 +02:00
parent 2ff48e981e
commit b33fa02b2d
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/basic/util.c
View File

@@ -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;

3
src/basic/util.h
View File

@@ -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;

10
src/udev/udev-rules.c
View File

@@ -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=");