diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-10-14 10:51:58 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-10-14 10:51:58 +0000 |
| commit | af33281cc7bb7426c27afeb013644fc31ed93237 (patch) | |
| tree | 06e4352beffc6583e3c618728fe0969c4bdfb0d9 /bin/rm | |
| parent | a1edf125c0bbacedc8779b9c7bc145218c38c6ed (diff) | |
delete useless setlocale(3);
noticed by Jan Stary <hans at stare dot cz>;
return from main while here;
feedback and OK tb@, OK martijn@
Diffstat (limited to 'bin/rm')
| -rw-r--r-- | bin/rm/rm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bin/rm/rm.c b/bin/rm/rm.c index b97d1767170..3242ef5f410 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rm.c,v 1.39 2016/06/28 18:00:59 tedu Exp $ */ +/* $OpenBSD: rm.c,v 1.40 2016/10/14 10:51:57 schwarze Exp $ */ /* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */ /*- @@ -34,7 +34,6 @@ #include <sys/stat.h> #include <sys/mount.h> -#include <locale.h> #include <err.h> #include <errno.h> #include <fcntl.h> @@ -73,8 +72,6 @@ main(int argc, char *argv[]) { int ch, rflag; - setlocale(LC_ALL, ""); - Pflag = rflag = 0; while ((ch = getopt(argc, argv, "dfiPRr")) != -1) switch(ch) { @@ -124,7 +121,7 @@ main(int argc, char *argv[]) rm_file(argv); } - exit(eval); + return (eval); } void |