From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 31 Oct 2024 01:24:06 +0000 (+0900)
Subject: machine: lookup_machine_by_name_or_pidref() returns negative errno on failure
X-Git-Tag: v257-rc1~74^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F34882%2Fhead;p=thirdparty%2Fsystemd.git

machine: lookup_machine_by_name_or_pidref() returns negative errno on failure

This effectively reverts d2c1451b7398f13439b694450a23def3cf31c8db.

After the commit d2ebf5cc1d59e29139f06efaa3a9b2c184cdaa25, sd_varlink_error()
returns negative errno, hence the function always return negative errno
on failure.
---

diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c
index c9f44f20ab2..bfa4095a3b0 100644
--- a/src/machine/machine-varlink.c
+++ b/src/machine/machine-varlink.c
@@ -236,8 +236,6 @@ int lookup_machine_by_name_or_pidref(sd_varlink *link, Manager *manager, const c
         assert(manager);
         assert(ret_machine);
 
-        /* This returns 0 on success, 1 on error and it is replied, and a negative errno otherwise. */
-
         if (machine_name) {
                 r = lookup_machine_by_name(link, manager, machine_name, &machine);
                 if (r == -EINVAL)
@@ -350,7 +348,7 @@ int vl_method_kill(sd_varlink *link, sd_json_variant *parameters, sd_varlink_met
         r = lookup_machine_by_name_or_pidref(link, manager, p.name, &p.pidref, &machine);
         if (r == -ESRCH)
                 return sd_varlink_error(link, "io.systemd.Machine.NoSuchMachine", NULL);
-        if (r != 0)
+        if (r < 0)
                 return r;
 
         if (isempty(p.swhom))
diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index 104958d4b80..151d06e5f4f 100644
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -526,7 +526,7 @@ static int vl_method_list(sd_varlink *link, sd_json_variant *parameters, sd_varl
                 r = lookup_machine_by_name_or_pidref(link, m, p.name, &p.pidref, &machine);
                 if (r == -ESRCH)
                         return sd_varlink_error(link, "io.systemd.Machine.NoSuchMachine", NULL);
-                if (r != 0)
+                if (r < 0)
                         return r;
 
                 return list_machine_one_and_maybe_read_metadata(link, machine, /* more = */ false, p.acquire_metadata);
@@ -576,7 +576,7 @@ static int lookup_machine_and_call_method(sd_varlink *link, sd_json_variant *par
         r = lookup_machine_by_name_or_pidref(link, manager, p.name, &p.pidref, &machine);
         if (r == -ESRCH)
                 return sd_varlink_error(link, "io.systemd.Machine.NoSuchMachine", NULL);
-        if (r != 0)
+        if (r < 0)
                 return r;
 
         return method(link, parameters, flags, machine);