From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 2 Jan 2025 13:10:18 +0000 (+0100)
Subject: tree-wide: Rename ret_slave to ret_peer
X-Git-Tag: v258-rc1~1727^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fbecf12fbb745ceda2da7d5f166cc9f7c3c1daf;p=thirdparty%2Fsystemd.git

tree-wide: Rename ret_slave to ret_peer
---

diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 82df771cec8..833c6617de7 100644
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -142,8 +142,8 @@ int getttyname_harder(int fd, char **ret);
 
 int ptsname_malloc(int fd, char **ret);
 
-int openpt_allocate(int flags, char **ret_slave);
-int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave);
+int openpt_allocate(int flags, char **ret_peer);
+int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_peer);
 int open_terminal_in_namespace(pid_t pid, const char *name, int mode);
 
 int vt_restore(int fd);
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 9edea3dfa47..d94805c4183 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -668,19 +668,19 @@ int machine_kill(Machine *m, KillWhom whom, int signo) {
         return manager_kill_unit(m->manager, m->unit, signo, NULL);
 }
 
-int machine_openpt(Machine *m, int flags, char **ret_slave) {
+int machine_openpt(Machine *m, int flags, char **ret_peer) {
         assert(m);
 
         switch (m->class) {
 
         case MACHINE_HOST:
-                return openpt_allocate(flags, ret_slave);
+                return openpt_allocate(flags, ret_peer);
 
         case MACHINE_CONTAINER:
                 if (!pidref_is_set(&m->leader))
                         return -EINVAL;
 
-                return openpt_allocate_in_namespace(m->leader.pid, flags, ret_slave);
+                return openpt_allocate_in_namespace(m->leader.pid, flags, ret_peer);
 
         default:
                 return -EOPNOTSUPP;
diff --git a/src/machine/machine.h b/src/machine/machine.h
index bf265143f03..30e4a6a4663 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -100,7 +100,7 @@ MachineState machine_state_from_string(const char *s) _pure_;
 const char* kill_whom_to_string(KillWhom k) _const_;
 KillWhom kill_whom_from_string(const char *s) _pure_;
 
-int machine_openpt(Machine *m, int flags, char **ret_slave);
+int machine_openpt(Machine *m, int flags, char **ret_peer);
 int machine_open_terminal(Machine *m, const char *path, int mode);
 int machine_start_getty(Machine *m, const char *ptmx_name, sd_bus_error *error);
 int machine_start_shell(Machine *m, int ptmx_fd, const char *ptmx_name, const char *user, const char *path, char **args, char **env, sd_bus_error *error);