From efda21ca931766eed6cfc49d1b2122c53827d9fc Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 29 Nov 2007 18:14:37 -0600 Subject: Change command main() functions to return void, and exit(toys.exitval) from the toybox infrastructure instead. Eliminates a return call from each command. --- main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index ba9dc947..4b58d8c2 100644 --- a/main.c +++ b/main.c @@ -80,13 +80,12 @@ void toy_exec(char *argv[]) which = toy_find(argv[0]); if (!which) return; - toy_init(which, argv); - - exit(toys.which->toy_main()); + toys.which->toy_main(); + exit(toys.exitval); } -int toybox_main(void) +void toybox_main(void) { static char *toy_paths[]={"usr/","bin/","sbin/",0}; int i, len = 0; @@ -115,7 +114,6 @@ int toybox_main(void) } } putchar('\n'); - return 0; } int main(int argc, char *argv[]) @@ -132,5 +130,6 @@ int main(int argc, char *argv[]) } toys.argv = argv-1; - return toybox_main(); + toybox_main(); + return 0; } -- cgit v1.2.3