morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 16:37:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

activate: reduce scope of iterator variable

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-09-22 17:31:08 +02:00
parent 89de370edd
commit 4ffd4705fb
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/activate/activate.c
View File

@@ -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) {
_cleanup_strv_free_ char **envp = NULL;
_cleanup_free_ char *joined = NULL;
size_t n_env = 0, length;
@@ -215,15 +214,13 @@ static int exec_process(const char *name, char **argv, char **env, int start_fd,
char *e;
len = strv_length(arg_fdnames);
if (len == 1) {
size_t i;
for (i = 1; i < n_fds; i++) {
if (len == 1)
for (size_t i = 1; i < n_fds; i++) {
r = strv_extend(&arg_fdnames, arg_fdnames[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);
names = strv_join(arg_fdnames, ":");