From: Ivan Kruglov <mail@ikruglov.com>
Date: Wed, 8 Jan 2025 12:48:19 +0000 (+0100)
Subject: machine: rename machine_copy_from_to() -> machine_copy_from_to_operation()
X-Git-Tag: v258-rc1~1426^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2694549ddf05a9710cb74fb7b6dc34ce4ea1959c;p=thirdparty%2Fsystemd.git

machine: rename machine_copy_from_to() -> machine_copy_from_to_operation()

This is done to make it clear that machine_copy_from_to() use and
returns an Operation object.
---

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 560f9f2a804..90b4c4baead 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -563,7 +563,7 @@ int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_erro
         }
 
         Operation *op;
-        r = machine_copy_from_to(manager, m, host_path, container_path, copy_from, copy_flags, &op);
+        r = machine_copy_from_to_operation(manager, m, host_path, container_path, copy_from, copy_flags, &op);
         if (r < 0)
                 return sd_bus_error_set_errnof(error, r, "Failed to copy from/to machine '%s': %m", m->name);
 
diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c
index 56dc0728d6a..038aa411ff4 100644
--- a/src/machine/machine-varlink.c
+++ b/src/machine/machine-varlink.c
@@ -913,7 +913,7 @@ int vl_method_copy_internal(sd_varlink *link, sd_json_variant *parameters, sd_va
                 return r;
 
         Operation *op;
-        r = machine_copy_from_to(manager, machine, host_path, container_path, copy_from, copy_flags, &op);
+        r = machine_copy_from_to_operation(manager, machine, host_path, container_path, copy_from, copy_flags, &op);
         if (r < 0)
                 return r;
 
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 76467f1bf6c..92d74a5aac6 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -954,7 +954,7 @@ char** machine_default_shell_args(const char *user) {
         return TAKE_PTR(args);
 }
 
-int machine_copy_from_to(
+int machine_copy_from_to_operation(
                 Manager *manager,
                 Machine *machine,
                 const char *host_path,
diff --git a/src/machine/machine.h b/src/machine/machine.h
index 6d972c15337..520c2fcade6 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -107,7 +107,7 @@ int machine_start_shell(Machine *m, int ptmx_fd, const char *ptmx_name, const ch
 #define machine_default_shell_path() ("/bin/sh")
 char** machine_default_shell_args(const char *user);
 
-int machine_copy_from_to(
+int machine_copy_from_to_operation(
                 Manager *manager,
                 Machine *machine,
                 const char *host_path,