summaryrefslogtreecommitdiff
path: root/console-tools
diff options
context:
space:
mode:
authorEric Andersen2000-06-19 17:25:40 +0000
committerEric Andersen2000-06-19 17:25:40 +0000
commitb610615be9aedfac07d1e01f12575707fa3a227c (patch)
treeb94c0d6a506d1ef77f79df246a26d504c84b7110 /console-tools
parentdbb3019d0de410960feac649a0b9320ae245cca1 (diff)
downloadbusybox-b610615be9aedfac07d1e01f12575707fa3a227c.zip
busybox-b610615be9aedfac07d1e01f12575707fa3a227c.tar.gz
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.c2
-rw-r--r--console-tools/clear.c2
-rw-r--r--console-tools/deallocvt.c6
-rw-r--r--console-tools/loadacm.c5
-rw-r--r--console-tools/loadkmap.c2
-rw-r--r--console-tools/setkeycodes.c2
6 files changed, 9 insertions, 10 deletions
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index 37fd21a..45a0439 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -33,7 +33,7 @@ int chvt_main(int argc, char **argv)
perror("VT_WAITACTIVE");
exit(FALSE);
}
- exit(TRUE);
+ return(TRUE);
}
diff --git a/console-tools/clear.c b/console-tools/clear.c
index c27787e..dba1056 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -29,5 +29,5 @@
extern int clear_main(int argc, char **argv)
{
printf("\033[H\033[J");
- exit(TRUE);
+ return(TRUE);
}
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index a1b8e4e..b65f7b0 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -34,7 +34,7 @@ int deallocvt_main(int argc, char *argv[])
/* deallocate all unused consoles */
if (ioctl(fd, VT_DISALLOCATE, 0)) {
perror("VT_DISALLOCATE");
- exit(1);
+ exit( FALSE);
}
} else
for (i = 1; i < argc; i++) {
@@ -48,8 +48,8 @@ int deallocvt_main(int argc, char *argv[])
perror("VT_DISALLOCATE");
fprintf(stderr, "%s: could not deallocate console %d\n",
progname, num);
- exit(1);
+ exit( FALSE);
}
}
- exit(0);
+ return( TRUE);
}
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index cca5406..cf393d9 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -140,10 +140,9 @@ int screen_map_load(int fd, FILE * fp)
perror("PIO_SCRNMAP ioctl"), exit(1);
else
return 0;
- } else {
- fprintf(stderr, "Error parsing symbolic map\n");
- exit(1);
}
+ fprintf(stderr, "Error parsing symbolic map\n");
+ return(1);
}
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 99efc51..9057414 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -94,5 +94,5 @@ int loadkmap_main(int argc, char **argv)
/* Don't bother to close files. Exit does that
* automagically, so we can save a few bytes */
/* close(fd); */
- exit(TRUE);
+ return(TRUE);
}
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index e933e14..9062caf 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -72,5 +72,5 @@ setkeycodes_main(int argc, char** argv)
argc -= 2;
argv += 2;
}
- exit( TRUE);
+ return( TRUE);
}