From dcb45976b361bd15684f4c0eb3686cbc3927f0df Mon Sep 17 00:00:00 2001 From: William McBrine Date: Wed, 1 Mar 2006 05:25:56 +0000 Subject: [PATCH] Here's the way to satisfy all compilers. --- demos/rain.c | 6 ++---- demos/worm.c | 16 +++++++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/demos/rain.c b/demos/rain.c index ff4fdf2e..625d3562 100644 --- a/demos/rain.c +++ b/demos/rain.c @@ -1,4 +1,4 @@ -/* $Id: rain.c,v 1.7 2006/02/24 02:40:31 wmcbrine Exp $ */ +/* $Id: rain.c,v 1.8 2006/03/01 05:25:56 wmcbrine Exp $ */ #include #include @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) case 'Q': curs_set(1); endwin(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; case 's': nodelay(stdscr, FALSE); break; @@ -123,6 +123,4 @@ int main(int argc, char *argv[]) } napms(50); } - - return EXIT_SUCCESS; /* unreachable */ } diff --git a/demos/worm.c b/demos/worm.c index 2987cc67..3374fe4f 100644 --- a/demos/worm.c +++ b/demos/worm.c @@ -23,7 +23,7 @@ Options: -n set number of worms -t make worms leave droppings - $Id: worm.c,v 1.11 2006/02/24 02:40:31 wmcbrine Exp $ + $Id: worm.c,v 1.12 2006/03/01 05:25:56 wmcbrine Exp $ */ #include @@ -149,7 +149,7 @@ int main(int argc, char *argv[]) if ((length = atoi(argv[x])) < 2 || length > 1024) { fprintf(stderr, "%s: Invalid length\n", *argv); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) { fprintf(stderr, "%s: Invalid number of worms\n", *argv); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } break; @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) usage: fprintf(stderr, "usage: %s [-field] [-length #] " "[-number #] [-trail]\n", *argv); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } } @@ -237,7 +237,7 @@ int main(int argc, char *argv[]) if ((ip = malloc(sizeof(short) * (length + 1))) == NULL) { fprintf(stderr, "%s: out of memory\n", *argv); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } w->xpos = ip; @@ -248,7 +248,7 @@ int main(int argc, char *argv[]) if ((ip = malloc(sizeof(short) * (length + 1))) == NULL) { fprintf(stderr, "%s: out of memory\n", *argv); - exit(EXIT_FAILURE); + return EXIT_FAILURE; } w->ypos = ip; @@ -329,7 +329,7 @@ int main(int argc, char *argv[]) if (ch == 'q') { cleanup(); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; } else if (ch == 's') nodelay(stdscr, FALSE); @@ -404,6 +404,4 @@ int main(int argc, char *argv[]) napms(12); refresh(); } - - return EXIT_SUCCESS; /* unreachable */ }