SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: normalize comment style

Browse Source
This commit is contained in:
Yu Watanabe
2025-12-15 08:50:13 +09:00
parent 8e20b9a79d
commit 93378148d4
431 changed files with 1894 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine.c
+23 -23
View File
@@ -509,7 +509,7 @@ static int machine_start_scope(
* doesn't support PIDFDs yet, let's try without. */
if (allow_pidfd &&
sd_bus_error_has_names(&e, SD_BUS_ERROR_UNKNOWN_PROPERTY, SD_BUS_ERROR_PROPERTY_READ_ONLY))
return machine_start_scope(machine, /* allow_pidfd = */ false, more_properties, error);
return machine_start_scope(machine, /* allow_pidfd= */ false, more_properties, error);
return sd_bus_error_move(error, &e);
}
@@ -532,7 +532,7 @@ static int machine_ensure_scope(Machine *m, sd_bus_message *properties, sd_bus_e
assert(m->class != MACHINE_HOST);
if (!m->unit) {
r = machine_start_scope(m, /* allow_pidfd = */ true, properties, error);
r = machine_start_scope(m, /* allow_pidfd= */ true, properties, error);
if (r < 0)
return log_error_errno(r, "Failed to start machine scope: %s", bus_error_message(error, r));
}
@@ -928,7 +928,7 @@ int machine_start_getty(Machine *m, const char *ptmx_name, sd_bus_error *error)
container_bus = allocated_bus ?: m->manager->system_bus;
getty = strjoina("container-getty@", p, ".service");
r = bus_call_method(container_bus, bus_systemd_mgr, "StartUnit", error, /* ret_reply = */ NULL, "ss", getty, "replace");
r = bus_call_method(container_bus, bus_systemd_mgr, "StartUnit", error, /* ret_reply= */ NULL, "ss", getty, "replace");
if (r < 0)
return log_debug_errno(r, "Failed to StartUnit '%s' in container '%s': %m", getty, m->name);
@@ -1183,14 +1183,14 @@ int machine_copy_from_to_operation(
r = namespace_fork("(sd-copyns)",
"(sd-copy)",
/* except_fds = */ NULL,
/* n_except_fds = */ 0,
/* except_fds= */ NULL,
/* n_except_fds= */ 0,
FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGKILL,
/* pidns_fd = */ -EBADF,
/* pidns_fd= */ -EBADF,
target_mntns_fd,
/* netns_fd = */ -EBADF,
/* userns_fd = */ -EBADF,
/* root_fd = */ -EBADF,
/* netns_fd= */ -EBADF,
/* userns_fd= */ -EBADF,
/* root_fd= */ -EBADF,
&child);
if (r < 0)
return log_debug_errno(r, "Failed to fork into mount namespace of machine '%s': %m", machine->name);
@@ -1223,8 +1223,8 @@ int machine_copy_from_to_operation(
uid_shift == 0 ? UID_INVALID : 0,
uid_shift == 0 ? GID_INVALID : 0,
copy_flags,
/* denylist = */ NULL,
/* subvolumes = */ NULL);
/* denylist= */ NULL,
/* subvolumes= */ NULL);
else
r = copy_tree_at(
host_fd,
@@ -1234,8 +1234,8 @@ int machine_copy_from_to_operation(
uid_shift == 0 ? UID_INVALID : uid_shift,
uid_shift == 0 ? GID_INVALID : uid_shift,
copy_flags,
/* denylist = */ NULL,
/* subvolumes = */ NULL);
/* denylist= */ NULL,
/* subvolumes= */ NULL);
if (r < 0)
log_debug_errno(r, "Failed to copy tree: %m");
@@ -1536,10 +1536,10 @@ int machine_open_root_directory(Machine *machine) {
pid_t child;
r = pidref_namespace_open(&machine->leader,
/* ret_pidns_fd = */ NULL,
/* ret_pidns_fd= */ NULL,
&mntns_fd,
/* ret_netns_fd = */ NULL,
/* ret_userns_fd = */ NULL,
/* ret_netns_fd= */ NULL,
/* ret_userns_fd= */ NULL,
&root_fd);
if (r < 0)
return log_debug_errno(r, "Failed to open mount namespace of machine '%s': %m", machine->name);
@@ -1553,13 +1553,13 @@ int machine_open_root_directory(Machine *machine) {
r = namespace_fork(
"(sd-openrootns)",
"(sd-openroot)",
/* except_fds = */ NULL,
/* n_except_fds = */ 0,
/* except_fds= */ NULL,
/* n_except_fds= */ 0,
FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGKILL,
/* pidns_fd = */ -EBADF,
/* pidns_fd= */ -EBADF,
mntns_fd,
/* netns_fd = */ -EBADF,
/* userns_fd = */ -EBADF,
/* netns_fd= */ -EBADF,
/* userns_fd= */ -EBADF,
root_fd,
&child);
if (r < 0)
@@ -1576,7 +1576,7 @@ int machine_open_root_directory(Machine *machine) {
report_errno_and_exit(errno_pipe_fd[1], -errno);
}
r = send_one_fd(fd_pass_socket[1], dfd, /* flags = */ 0);
r = send_one_fd(fd_pass_socket[1], dfd, /* flags= */ 0);
dfd = safe_close(dfd);
if (r < 0) {
log_debug_errno(r, "Failed to send FD over socket: %m");
@@ -1589,7 +1589,7 @@ int machine_open_root_directory(Machine *machine) {
errno_pipe_fd[1] = safe_close(errno_pipe_fd[1]);
fd_pass_socket[1] = safe_close(fd_pass_socket[1]);
r = wait_for_terminate_and_check("(sd-openrootns)", child, /* flags = */ 0);
r = wait_for_terminate_and_check("(sd-openrootns)", child, /* flags= */ 0);
if (r < 0)
return log_debug_errno(r, "Failed to wait for child: %m");