From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 9 Jul 2023 19:33:22 +0000 (-0600)
Subject: coredump: use RET_NERRNO and RET_GATHER
X-Git-Tag: v255-rc1~908^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60ecc386ab9a8788e92e7d92ee45f7d0f531a2bd;p=thirdparty%2Fsystemd.git

coredump: use RET_NERRNO and RET_GATHER

No functional change indended.
---

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 24b019294bb..8ae4a9f63fa 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -245,8 +245,7 @@ static int fix_xattr(int fd, const Context *context) {
 
         assert(fd >= 0);
 
-        /* Attach some metadata to coredumps via extended
-         * attributes. Just because we can. */
+        /* Attach some metadata to coredumps via extended attributes. Just because we can. */
 
         for (unsigned i = 0; i < _META_MAX; i++) {
                 int k;
@@ -254,9 +253,8 @@ static int fix_xattr(int fd, const Context *context) {
                 if (isempty(context->meta[i]) || !xattrs[i])
                         continue;
 
-                k = fsetxattr(fd, xattrs[i], context->meta[i], strlen(context->meta[i]), XATTR_CREATE);
-                if (k < 0 && r == 0)
-                        r = -errno;
+                k = RET_NERRNO(fsetxattr(fd, xattrs[i], context->meta[i], strlen(context->meta[i]), XATTR_CREATE));
+                RET_GATHER(r, k);
         }
 
         return r;