From: Ivan Kruglov <mail@ikruglov.com>
Date: Thu, 31 Oct 2024 10:01:16 +0000 (+0100)
Subject: machine: use report_errno_and_exit() in dbus code
X-Git-Tag: v257-rc1~50^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95d5b9097ba6ecba27cc754c84203b4c5ec6cc74;p=thirdparty%2Fsystemd.git

machine: use report_errno_and_exit() in dbus code
---

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index 2ae61f99b75..8eca1e4c958 100644
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -67,14 +67,8 @@ int bus_image_method_remove(
                 return sd_bus_error_set_errnof(error, r, "Failed to fork(): %m");
         if (r == 0) {
                 errno_pipe_fd[0] = safe_close(errno_pipe_fd[0]);
-
                 r = image_remove(image);
-                if (r < 0) {
-                        (void) write(errno_pipe_fd[1], &r, sizeof(r));
-                        _exit(EXIT_FAILURE);
-                }
-
-                _exit(EXIT_SUCCESS);
+                report_errno_and_exit(errno_pipe_fd[1], r);
         }
 
         errno_pipe_fd[1] = safe_close(errno_pipe_fd[1]);
@@ -184,14 +178,8 @@ int bus_image_method_clone(
                 return sd_bus_error_set_errnof(error, r, "Failed to fork(): %m");
         if (r == 0) {
                 errno_pipe_fd[0] = safe_close(errno_pipe_fd[0]);
-
                 r = image_clone(image, new_name, read_only);
-                if (r < 0) {
-                        (void) write(errno_pipe_fd[1], &r, sizeof(r));
-                        _exit(EXIT_FAILURE);
-                }
-
-                _exit(EXIT_SUCCESS);
+                report_errno_and_exit(errno_pipe_fd[1], r);
         }
 
         errno_pipe_fd[1] = safe_close(errno_pipe_fd[1]);