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 /console-tools | |
| 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 'console-tools')
| -rw-r--r-- | console-tools/chvt.c | 2 | ||||
| -rw-r--r-- | console-tools/clear.c | 2 | ||||
| -rw-r--r-- | console-tools/deallocvt.c | 6 | ||||
| -rw-r--r-- | console-tools/loadacm.c | 5 | ||||
| -rw-r--r-- | console-tools/loadkmap.c | 2 | ||||
| -rw-r--r-- | console-tools/setkeycodes.c | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c index 37fd21ae9..45a04397a 100644 --- a/console-tools/chvt.c +++ b/console-tools/chvt.c | |||
| @@ -33,7 +33,7 @@ int chvt_main(int argc, char **argv) | |||
| 33 | perror("VT_WAITACTIVE"); | 33 | perror("VT_WAITACTIVE"); |
| 34 | exit(FALSE); | 34 | exit(FALSE); |
| 35 | } | 35 | } |
| 36 | exit(TRUE); | 36 | return(TRUE); |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | 39 | ||
diff --git a/console-tools/clear.c b/console-tools/clear.c index c27787ed3..dba105691 100644 --- a/console-tools/clear.c +++ b/console-tools/clear.c | |||
| @@ -29,5 +29,5 @@ | |||
| 29 | extern int clear_main(int argc, char **argv) | 29 | extern int clear_main(int argc, char **argv) |
| 30 | { | 30 | { |
| 31 | printf("\033[H\033[J"); | 31 | printf("\033[H\033[J"); |
| 32 | exit(TRUE); | 32 | return(TRUE); |
| 33 | } | 33 | } |
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c index a1b8e4eea..b65f7b098 100644 --- a/console-tools/deallocvt.c +++ b/console-tools/deallocvt.c | |||
| @@ -34,7 +34,7 @@ int deallocvt_main(int argc, char *argv[]) | |||
| 34 | /* deallocate all unused consoles */ | 34 | /* deallocate all unused consoles */ |
| 35 | if (ioctl(fd, VT_DISALLOCATE, 0)) { | 35 | if (ioctl(fd, VT_DISALLOCATE, 0)) { |
| 36 | perror("VT_DISALLOCATE"); | 36 | perror("VT_DISALLOCATE"); |
| 37 | exit(1); | 37 | exit( FALSE); |
| 38 | } | 38 | } |
| 39 | } else | 39 | } else |
| 40 | for (i = 1; i < argc; i++) { | 40 | for (i = 1; i < argc; i++) { |
| @@ -48,8 +48,8 @@ int deallocvt_main(int argc, char *argv[]) | |||
| 48 | perror("VT_DISALLOCATE"); | 48 | perror("VT_DISALLOCATE"); |
| 49 | fprintf(stderr, "%s: could not deallocate console %d\n", | 49 | fprintf(stderr, "%s: could not deallocate console %d\n", |
| 50 | progname, num); | 50 | progname, num); |
| 51 | exit(1); | 51 | exit( FALSE); |
| 52 | } | 52 | } |
| 53 | } | 53 | } |
| 54 | exit(0); | 54 | return( TRUE); |
| 55 | } | 55 | } |
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c index cca5406ee..cf393d92d 100644 --- a/console-tools/loadacm.c +++ b/console-tools/loadacm.c | |||
| @@ -140,10 +140,9 @@ int screen_map_load(int fd, FILE * fp) | |||
| 140 | perror("PIO_SCRNMAP ioctl"), exit(1); | 140 | perror("PIO_SCRNMAP ioctl"), exit(1); |
| 141 | else | 141 | else |
| 142 | return 0; | 142 | return 0; |
| 143 | } else { | ||
| 144 | fprintf(stderr, "Error parsing symbolic map\n"); | ||
| 145 | exit(1); | ||
| 146 | } | 143 | } |
| 144 | fprintf(stderr, "Error parsing symbolic map\n"); | ||
| 145 | return(1); | ||
| 147 | } | 146 | } |
| 148 | 147 | ||
| 149 | 148 | ||
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c index 99efc5101..905741467 100644 --- a/console-tools/loadkmap.c +++ b/console-tools/loadkmap.c | |||
| @@ -94,5 +94,5 @@ int loadkmap_main(int argc, char **argv) | |||
| 94 | /* Don't bother to close files. Exit does that | 94 | /* Don't bother to close files. Exit does that |
| 95 | * automagically, so we can save a few bytes */ | 95 | * automagically, so we can save a few bytes */ |
| 96 | /* close(fd); */ | 96 | /* close(fd); */ |
| 97 | exit(TRUE); | 97 | return(TRUE); |
| 98 | } | 98 | } |
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c index e933e14bc..9062caf75 100644 --- a/console-tools/setkeycodes.c +++ b/console-tools/setkeycodes.c | |||
| @@ -72,5 +72,5 @@ setkeycodes_main(int argc, char** argv) | |||
| 72 | argc -= 2; | 72 | argc -= 2; |
| 73 | argv += 2; | 73 | argv += 2; |
| 74 | } | 74 | } |
| 75 | exit( TRUE); | 75 | return( TRUE); |
| 76 | } | 76 | } |