4 files changed, 7 insertions, 11 deletions

diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index ef4a5256f..728e1ec2f 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -53,9 +53,7 @@ extern int mkfifo_main(int argc, char **argv)
         }
         if (argc < 1 || *argv[0] == '-')
                 usage(mkfifo_usage);
-        if (mkfifo(*argv, mode) < 0) {
-                perror("mkfifo");
-                return EXIT_FAILURE;
-        }
+        if (mkfifo(*argv, mode) < 0)
+                perror_msg_and_die("mkfifo");
         return EXIT_SUCCESS;
 }
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 022ab8571..4d8c598ea 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -84,7 +84,7 @@ int mknod_main(int argc, char **argv)
         mode |= perm;
 
         if (mknod(argv[0], mode, dev) != 0)
-                error_msg_and_die("%s: %s\n", argv[0], strerror(errno));
+                perror_msg_and_die("%s", argv[0]);
         return EXIT_SUCCESS;
 }
 
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index ad92b106d..10eca593e 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -30,9 +30,7 @@ extern int sleep_main(int argc, char **argv)
                 usage(sleep_usage);
         }
 
-        if (sleep(atoi(*(++argv))) != 0) {
-                perror("sleep");
-                return EXIT_FAILURE;
-        }
+        if (sleep(atoi(*(++argv))) != 0)
+                perror_msg_and_die("sleep");
         return EXIT_SUCCESS;
 }
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 2781b80b3..e7e9ff331 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -114,11 +114,11 @@ int uname_main(int argc, char **argv)
                 toprint = PRINT_SYSNAME;
 
         if (uname(&name) == -1)
-                perror("cannot get system name");
+                perror_msg("cannot get system name");
 
 #if defined (HAVE_SYSINFO) && defined (SI_ARCHITECTURE)
         if (sysinfo(SI_ARCHITECTURE, processor, sizeof(processor)) == -1)
-                perror("cannot get processor type");
+                perror_msg("cannot get processor type");
 }
 
 #else