From: Vojtech P. <vo...@us...> - 2004-01-27 20:17:10
|
Update of /cvsroot/linuxconsole/ruby/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12670 Modified Files: jstest.c Log Message: Use return instead of exit() - it's more portable. Index: jstest.c =================================================================== RCS file: /cvsroot/linuxconsole/ruby/utils/jstest.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- jstest.c 8 Oct 2002 10:55:35 -0000 1.5 +++ jstest.c 27 Jan 2004 20:15:59 -0000 1.6 @@ -67,11 +67,11 @@ puts(" --nonblock Same as --event, in nonblocking mode"); puts(" --select Same as --event, using select() call"); puts(""); - exit(1); + return 1; } if ((fd = open(argv[argc - 1], O_RDONLY)) < 0) { perror("jstest"); - exit(1); + return 1; } ioctl(fd, JSIOCGVERSION, &version); @@ -95,7 +95,7 @@ if (read(fd, &js, JS_RETURN) != JS_RETURN) { perror("\njstest: error reading"); - exit(1); + return 1; } printf("Axes: X:%3d Y:%3d Buttons: A:%s B:%s\r", @@ -124,7 +124,7 @@ while (1) { if (read(fd, &js, sizeof(struct js_event)) != sizeof(struct js_event)) { perror("\njstest: error reading"); - exit (1); + return 1; } switch(js.type & ~JS_EVENT_INIT) { @@ -166,7 +166,7 @@ while (1) { if (read(fd, &js, sizeof(struct js_event)) != sizeof(struct js_event)) { perror("\njstest: error reading"); - exit (1); + return 1; } printf("Event: type %d, time %d, number %d, value %d\n", @@ -195,7 +195,7 @@ if (errno != EAGAIN) { perror("\njstest: error reading"); - exit (1); + return 1; } usleep(10000); @@ -224,7 +224,7 @@ if (read(fd, &js, sizeof(struct js_event)) != sizeof(struct js_event)) { perror("\njstest: error reading"); - exit (1); + return 1; } printf("Event: type %d, time %d, number %d, value %d\n", |