crash-manager: Simplify dump_core error reporting

Change-Id: If8ff95811e4e5f16cb3a7a2e48dfe34a0bd3b1cb

diff --git a/src/crash-manager/crash-manager.c b/src/crash-manager/crash-manager.c
index 3f3e089..98630b5 100644 (file)
--- a/src/crash-manager/crash-manager.c
+++ b/src/crash-manager/crash-manager.c
@@ -840,24 +840,20 @@ static int execute_minicoredump(int argc, char *argv[])
        if (!dump_core) {
                int ret = -1;
                int errno_unlink = 0;
-               char errno_buff[128];
-               char *err_str = NULL;
                int dirfd = open(crash_info.pfx, O_DIRECTORY);
                if (dirfd != -1) {
                        ret = unlinkat(dirfd, coredump_name, 0);
                        errno_unlink = errno;
                        close(dirfd);
+                       errno = errno_unlink; /* for %m below */
                }
 
-               if (ret != 0) {
-                       err_str = strerror_r(errno_unlink, errno_buff, sizeof(errno_buff));
-                       if (err_str == NULL)
-                               _E("strerror_r() error: %m\n");
-                               goto out;
-               }
-
-               _D("Saving core disabled - removing coredump %s/%s: %s", crash_info.pfx, coredump_name,
-                  ret == 0 ? "success" : err_str);
+               if (ret != 0)
+                       _E("Saving core disabled - removing coredump %s/%s failed: %m",
+                          crash_info.pfx, coredump_name);
+               else
+                       _D("Saving core disabled - removed coredump %s/%s",
+                          crash_info.pfx, coredump_name);
        }
 
 out: