diff options
| author | Eric Andersen <andersen@codepoet.org> | 2000-06-19 17:25:40 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2000-06-19 17:25:40 +0000 |
| commit | b610615be9aedfac07d1e01f12575707fa3a227c (patch) | |
| tree | b94c0d6a506d1ef77f79df246a26d504c84b7110 /util-linux | |
| parent | dbb3019d0de410960feac649a0b9320ae245cca1 (diff) | |
| download | busybox-w32-b610615be9aedfac07d1e01f12575707fa3a227c.tar.gz busybox-w32-b610615be9aedfac07d1e01f12575707fa3a227c.tar.bz2 busybox-w32-b610615be9aedfac07d1e01f12575707fa3a227c.zip | |
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
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/dmesg.c | 3 | ||||
| -rw-r--r-- | util-linux/fbset.c | 2 | ||||
| -rw-r--r-- | util-linux/fdflush.c | 2 | ||||
| -rw-r--r-- | util-linux/freeramdisk.c | 2 | ||||
| -rw-r--r-- | util-linux/mkswap.c | 2 | ||||
| -rw-r--r-- | util-linux/more.c | 2 |
6 files changed, 6 insertions, 7 deletions
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) | |||
| 128 | exit(FALSE); | 128 | exit(FALSE); |
| 129 | klogctl_error: | 129 | klogctl_error: |
| 130 | perror("klogctl"); | 130 | perror("klogctl"); |
| 131 | exit(FALSE); | 131 | return(FALSE); |
| 132 | |||
| 133 | } | 132 | } |
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) | |||
| 329 | /* Don't close the file, as exiting will take care of that */ | 329 | /* Don't close the file, as exiting will take care of that */ |
| 330 | /* close(fh); */ | 330 | /* close(fh); */ |
| 331 | 331 | ||
| 332 | exit (TRUE); | 332 | return (TRUE); |
| 333 | } | 333 | } |
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) | |||
| 56 | perror(*argv); | 56 | perror(*argv); |
| 57 | exit(FALSE); | 57 | exit(FALSE); |
| 58 | } | 58 | } |
| 59 | exit(TRUE); | 59 | return(TRUE); |
| 60 | } | 60 | } |
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) | |||
| 58 | /* Don't bother closing. Exit does | 58 | /* Don't bother closing. Exit does |
| 59 | * that, so we can save a few bytes */ | 59 | * that, so we can save a few bytes */ |
| 60 | /* close(f); */ | 60 | /* close(f); */ |
| 61 | exit(TRUE); | 61 | return(TRUE); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | /* | 64 | /* |
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); | |||
| 469 | */ | 469 | */ |
| 470 | if (fsync(DEV)) | 470 | if (fsync(DEV)) |
| 471 | die("fsync failed"); | 471 | die("fsync failed"); |
| 472 | exit(TRUE); | 472 | return(TRUE); |
| 473 | } | 473 | } |
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) | |||
| 221 | #ifdef BB_FEATURE_USE_TERMIOS | 221 | #ifdef BB_FEATURE_USE_TERMIOS |
| 222 | gotsig(0); | 222 | gotsig(0); |
| 223 | #endif | 223 | #endif |
| 224 | exit(TRUE); | 224 | return(TRUE); |
| 225 | } | 225 | } |