diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index e02a16b739..a750f570d4 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -793,7 +793,7 @@ static int address_update(Address *address) { return r; } - link_update_operstate(link, /* also_update_master = */ true); + link_update_operstate(link, /* also_update_bond_master = */ true); link_check_ready(link); return 0; } @@ -868,7 +868,7 @@ static int address_drop(Address *in, bool removed_by_us) { } } - link_update_operstate(link, /* also_update_master = */ true); + link_update_operstate(link, /* also_update_bond_master = */ true); link_check_ready(link); return 0; } diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index f86d1932bd..dc380bbe48 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -1230,6 +1230,6 @@ int manager_reload(Manager *m, sd_bus_message *message) { log_debug("Reloaded."); r = 0; finish: - (void) sd_notify(/* unset= */ false, NOTIFY_READY); + (void) sd_notify(/* unset_environment= */ false, NOTIFY_READY); return r; } diff --git a/src/ssh-generator/ssh-proxy.c b/src/ssh-generator/ssh-proxy.c index 19f47dcee3..3c21f8d898 100644 --- a/src/ssh-generator/ssh-proxy.c +++ b/src/ssh-generator/ssh-proxy.c @@ -41,7 +41,7 @@ static int process_vsock_cid(unsigned cid, const char *port) { return log_error_errno(errno, "Failed to connect to vsock:%u:%u: %m", sa.vm.svm_cid, sa.vm.svm_port); /* OpenSSH wants us to send a single byte along with the file descriptor, hence do so */ - r = send_one_fd_iov(STDOUT_FILENO, fd, &iovec_nul_byte, /* n_iovec= */ 1, /* flags= */ 0); + r = send_one_fd_iov(STDOUT_FILENO, fd, &iovec_nul_byte, /* iovlen= */ 1, /* flags= */ 0); if (r < 0) return log_error_errno(r, "Failed to send socket via STDOUT: %m"); @@ -86,7 +86,7 @@ static int process_unix(const char *path) { if (r < 0) return log_error_errno(r, "Failed to connect to AF_UNIX socket %s: %m", path); - r = send_one_fd_iov(STDOUT_FILENO, fd, &iovec_nul_byte, /* n_iovec= */ 1, /* flags= */ 0); + r = send_one_fd_iov(STDOUT_FILENO, fd, &iovec_nul_byte, /* iovlen= */ 1, /* flags= */ 0); if (r < 0) return log_error_errno(r, "Failed to send socket via STDOUT: %m"); @@ -130,7 +130,7 @@ static int process_vsock_mux(const char *path, const char *port) { if (r < 0) return log_error_errno(r, "Failed to send CONNECT to %s:%s: %m", path, port); - r = send_one_fd_iov(STDOUT_FILENO, fd, &iovec_nul_byte, /* n_iovec= */ 1, /* flags= */ 0); + r = send_one_fd_iov(STDOUT_FILENO, fd, &iovec_nul_byte, /* iovlen= */ 1, /* flags= */ 0); if (r < 0) return log_error_errno(r, "Failed to send socket via STDOUT: %m");