Merge pull request #17130 from keszybz/static-analyzer-cleanups
Trivial cleanups based on static analysis
This commit is contained in:
commit
6b6737119a
|
@ -122,7 +122,6 @@ static int open_sockets(int *epoll_fd, bool accept) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static int exec_process(const char *name, char **argv, char **env, int start_fd, size_t n_fds) {
|
static int exec_process(const char *name, char **argv, char **env, int start_fd, size_t n_fds) {
|
||||||
|
|
||||||
_cleanup_strv_free_ char **envp = NULL;
|
_cleanup_strv_free_ char **envp = NULL;
|
||||||
_cleanup_free_ char *joined = NULL;
|
_cleanup_free_ char *joined = NULL;
|
||||||
size_t n_env = 0, length;
|
size_t n_env = 0, length;
|
||||||
|
@ -200,7 +199,6 @@ static int exec_process(const char *name, char **argv, char **env, int start_fd,
|
||||||
return log_error_errno(errno, "Failed to dup connection: %m");
|
return log_error_errno(errno, "Failed to dup connection: %m");
|
||||||
|
|
||||||
safe_close(start_fd);
|
safe_close(start_fd);
|
||||||
start_fd = SD_LISTEN_FDS_START;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (asprintf((char **) (envp + n_env++), "LISTEN_FDS=%zu", n_fds) < 0)
|
if (asprintf((char **) (envp + n_env++), "LISTEN_FDS=%zu", n_fds) < 0)
|
||||||
|
@ -215,15 +213,13 @@ static int exec_process(const char *name, char **argv, char **env, int start_fd,
|
||||||
char *e;
|
char *e;
|
||||||
|
|
||||||
len = strv_length(arg_fdnames);
|
len = strv_length(arg_fdnames);
|
||||||
if (len == 1) {
|
if (len == 1)
|
||||||
size_t i;
|
for (size_t i = 1; i < n_fds; i++) {
|
||||||
|
|
||||||
for (i = 1; i < n_fds; i++) {
|
|
||||||
r = strv_extend(&arg_fdnames, arg_fdnames[0]);
|
r = strv_extend(&arg_fdnames, arg_fdnames[0]);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_error_errno(r, "Failed to extend strv: %m");
|
return log_oom();
|
||||||
}
|
}
|
||||||
} else if (len != n_fds)
|
else if (len != n_fds)
|
||||||
log_warning("The number of fd names is different than number of fds: %zu vs %zu", len, n_fds);
|
log_warning("The number of fd names is different than number of fds: %zu vs %zu", len, n_fds);
|
||||||
|
|
||||||
names = strv_join(arg_fdnames, ":");
|
names = strv_join(arg_fdnames, ":");
|
||||||
|
|
|
@ -79,7 +79,7 @@ static int find_pci_or_platform_parent(sd_device *device, sd_device **ret) {
|
||||||
|
|
||||||
} else if (streq(subsystem, "pci") &&
|
} else if (streq(subsystem, "pci") &&
|
||||||
sd_device_get_sysattr_value(parent, "class", &value) >= 0) {
|
sd_device_get_sysattr_value(parent, "class", &value) >= 0) {
|
||||||
unsigned long class = 0;
|
unsigned long class;
|
||||||
|
|
||||||
r = safe_atolu(value, &class);
|
r = safe_atolu(value, &class);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
|
|
|
@ -64,15 +64,15 @@ typedef enum ProcSubset {
|
||||||
} ProcSubset;
|
} ProcSubset;
|
||||||
|
|
||||||
struct NamespaceInfo {
|
struct NamespaceInfo {
|
||||||
bool ignore_protect_paths:1;
|
bool ignore_protect_paths;
|
||||||
bool private_dev:1;
|
bool private_dev;
|
||||||
bool private_mounts:1;
|
bool private_mounts;
|
||||||
bool protect_control_groups:1;
|
bool protect_control_groups;
|
||||||
bool protect_kernel_tunables:1;
|
bool protect_kernel_tunables;
|
||||||
bool protect_kernel_modules:1;
|
bool protect_kernel_modules;
|
||||||
bool protect_kernel_logs:1;
|
bool protect_kernel_logs;
|
||||||
bool mount_apivfs:1;
|
bool mount_apivfs;
|
||||||
bool protect_hostname:1;
|
bool protect_hostname;
|
||||||
ProtectHome protect_home;
|
ProtectHome protect_home;
|
||||||
ProtectSystem protect_system;
|
ProtectSystem protect_system;
|
||||||
ProtectProc protect_proc;
|
ProtectProc protect_proc;
|
||||||
|
@ -82,10 +82,10 @@ struct NamespaceInfo {
|
||||||
struct BindMount {
|
struct BindMount {
|
||||||
char *source;
|
char *source;
|
||||||
char *destination;
|
char *destination;
|
||||||
bool read_only:1;
|
bool read_only;
|
||||||
bool nosuid:1;
|
bool nosuid;
|
||||||
bool recursive:1;
|
bool recursive;
|
||||||
bool ignore_enoent:1;
|
bool ignore_enoent;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TemporaryFileSystem {
|
struct TemporaryFileSystem {
|
||||||
|
|
|
@ -689,7 +689,6 @@ _public_ int sd_radv_add_route_prefix(sd_radv *ra, sd_radv_route_prefix *p, int
|
||||||
LIST_APPEND(prefix, ra->route_prefixes, p);
|
LIST_APPEND(prefix, ra->route_prefixes, p);
|
||||||
ra->n_route_prefixes++;
|
ra->n_route_prefixes++;
|
||||||
|
|
||||||
cur = p;
|
|
||||||
if (!dynamic) {
|
if (!dynamic) {
|
||||||
log_radv("Added prefix %s/%u", strempty(pretty), p->opt.prefixlen);
|
log_radv("Added prefix %s/%u", strempty(pretty), p->opt.prefixlen);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -70,7 +70,7 @@ static int server_init(sd_bus **_bus) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
r = sd_bus_get_description(bus, &desc);
|
assert_se(sd_bus_get_description(bus, &desc) >= 0);
|
||||||
assert_se(streq(desc, "my bus!"));
|
assert_se(streq(desc, "my bus!"));
|
||||||
|
|
||||||
log_info("Peer ID is " SD_ID128_FORMAT_STR ".", SD_ID128_FORMAT_VAL(id));
|
log_info("Peer ID is " SD_ID128_FORMAT_STR ".", SD_ID128_FORMAT_VAL(id));
|
||||||
|
|
|
@ -997,20 +997,13 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) {
|
||||||
if (!good)
|
if (!good)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
*m = FD_TO_MONITOR(fd);
|
*m = FD_TO_MONITOR(TAKE_FD(fd));
|
||||||
fd = -1;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
_public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) {
|
_public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) {
|
||||||
int fd;
|
if (m)
|
||||||
|
close_nointr(MONITOR_TO_FD(m));
|
||||||
if (!m)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
fd = MONITOR_TO_FD(m);
|
|
||||||
close_nointr(fd);
|
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,8 +135,7 @@ int netlink_open_family(sd_netlink **ret, int family) {
|
||||||
r = sd_netlink_open_fd(ret, fd);
|
r = sd_netlink_open_fd(ret, fd);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
TAKE_FD(fd);
|
||||||
fd = -1;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -373,19 +373,13 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category
|
||||||
if (!good)
|
if (!good)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
*m = FD_TO_MONITOR(fd);
|
*m = FD_TO_MONITOR(TAKE_FD(fd));
|
||||||
fd = -1;
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
_public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
|
_public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) {
|
||||||
int fd;
|
if (m)
|
||||||
|
close_nointr(MONITOR_TO_FD(m));
|
||||||
if (m) {
|
|
||||||
fd = MONITOR_TO_FD(m);
|
|
||||||
close_nointr(fd);
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3195,7 +3195,6 @@ static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error
|
||||||
_cleanup_free_ char *id = NULL;
|
_cleanup_free_ char *id = NULL;
|
||||||
_cleanup_close_ int fifo_fd = -1;
|
_cleanup_close_ int fifo_fd = -1;
|
||||||
Manager *m = userdata;
|
Manager *m = userdata;
|
||||||
Inhibitor *i = NULL;
|
|
||||||
InhibitMode mm;
|
InhibitMode mm;
|
||||||
InhibitWhat w;
|
InhibitWhat w;
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
@ -3278,6 +3277,7 @@ static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error
|
||||||
|
|
||||||
} while (hashmap_get(m->inhibitors, id));
|
} while (hashmap_get(m->inhibitors, id));
|
||||||
|
|
||||||
|
_cleanup_(inhibitor_freep) Inhibitor *i = NULL;
|
||||||
r = manager_add_inhibitor(m, id, &i);
|
r = manager_add_inhibitor(m, id, &i);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return r;
|
return r;
|
||||||
|
@ -3289,28 +3289,18 @@ static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error
|
||||||
i->why = strdup(why);
|
i->why = strdup(why);
|
||||||
i->who = strdup(who);
|
i->who = strdup(who);
|
||||||
|
|
||||||
if (!i->why || !i->who) {
|
if (!i->why || !i->who)
|
||||||
r = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
fifo_fd = inhibitor_create_fifo(i);
|
fifo_fd = inhibitor_create_fifo(i);
|
||||||
if (fifo_fd < 0) {
|
if (fifo_fd < 0)
|
||||||
r = fifo_fd;
|
return fifo_fd;
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
r = inhibitor_start(i);
|
r = inhibitor_start(i);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
goto fail;
|
return r;
|
||||||
|
|
||||||
return sd_bus_reply_method_return(message, "h", fifo_fd);
|
return sd_bus_reply_method_return(message, "h", fifo_fd);
|
||||||
|
|
||||||
fail:
|
|
||||||
if (i)
|
|
||||||
inhibitor_free(i);
|
|
||||||
|
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const sd_bus_vtable manager_vtable[] = {
|
static const sd_bus_vtable manager_vtable[] = {
|
||||||
|
|
|
@ -703,7 +703,7 @@ int config_parse_tristate(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
*t = !!k;
|
*t = k;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue