From b610615be9aedfac07d1e01f12575707fa3a227c Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 19 Jun 2000 17:25:40 +0000
Subject: Updates to a number of apps to remove warnings/compile errors under
 libc5. Tested under both libc5 and libc6 and all seems well with these fixes.
  -Erik

---
 util-linux/dmesg.c       | 3 +--
 util-linux/fbset.c       | 2 +-
 util-linux/fdflush.c     | 2 +-
 util-linux/freeramdisk.c | 2 +-
 util-linux/mkswap.c      | 2 +-
 util-linux/more.c        | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'util-linux')

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index c4f4fb408..20846f7c6 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -128,6 +128,5 @@ int dmesg_main(int argc, char **argv)
 	exit(FALSE);
   klogctl_error:
 	perror("klogctl");
-	exit(FALSE);
-
+	return(FALSE);
 }
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index de4c82425..0a84dce23 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -329,5 +329,5 @@ extern int fbset_main(int argc, char **argv)
 	/* Don't close the file, as exiting will take care of that */
 	/* close(fh); */
 
-	exit (TRUE);
+	return (TRUE);
 }
diff --git a/util-linux/fdflush.c b/util-linux/fdflush.c
index 4ec0a8886..81f0472c6 100644
--- a/util-linux/fdflush.c
+++ b/util-linux/fdflush.c
@@ -56,5 +56,5 @@ extern int fdflush_main(int argc, char **argv)
 		perror(*argv);
 		exit(FALSE);
 	}
-	exit(TRUE);
+	return(TRUE);
 }
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index cabe5660b..fdac5ea46 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -58,7 +58,7 @@ freeramdisk_main(int argc, char **argv)
 	/* Don't bother closing.  Exit does
 	 * that, so we can save a few bytes */
 	/* close(f); */
-	exit(TRUE);
+	return(TRUE);
 }
 
 /*
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 7d76916f0..fc37368f4 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -469,5 +469,5 @@ the -f option to force it.\n", program_name, device_name);
 	 */
 	if (fsync(DEV))
 		die("fsync failed");
-	exit(TRUE);
+	return(TRUE);
 }
diff --git a/util-linux/more.c b/util-linux/more.c
index 549a41730..131016578 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -221,5 +221,5 @@ extern int more_main(int argc, char **argv)
 #ifdef BB_FEATURE_USE_TERMIOS
 	gotsig(0);
 #endif
-	exit(TRUE);
+	return(TRUE);
 }
-- 
cgit v1.2.3