tree-wide: add a single version of "static const int one = 1"

All over the place we define local variables for the various sockopts
that take a bool-like "int" value. Sometimes they are const, sometimes
static, sometimes both, sometimes neither.

Let's clean this up, introduce a common const variable "const_int_one"
(as well as one matching "const_int_zero") and use it everywhere, all
acorss the codebase.
This commit is contained in:
Lennart Poettering
2018-10-15 19:40:51 +02:00
parent 8e8132c6b8
commit 6d5e65f645
24 changed files with 104 additions and 128 deletions
+1 -2
View File
@@ -2812,7 +2812,6 @@ static int inner_child(
}
static int setup_sd_notify_child(void) {
static const int one = 1;
int fd = -1;
union sockaddr_union sa = {
.un.sun_family = AF_UNIX,
@@ -2839,7 +2838,7 @@ static int setup_sd_notify_child(void) {
return log_error_errno(r, "Failed to chown " NSPAWN_NOTIFY_SOCKET_PATH ": %m");
}
r = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
r = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &const_int_one, sizeof(const_int_one));
if (r < 0) {
safe_close(fd);
return log_error_errno(errno, "SO_PASSCRED failed: %m");