Hi,
this diff changes the following:
- exit(3) to return at the end of main functions
- use /* NOTREACHED */ were it belongs according to style(9)
- lpc.c and lpd.c lack a return at the end of the main functions, as the main
loops exists the
program. I'm not sure if this is a "coders choise" argument, so correct me if
I'm wrong.
--F.
Index: filters/lpf.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/filters/lpf.c,v
retrieving revision 1.13
diff -u -p -r1.13 lpf.c
--- filters/lpf.c 9 Feb 2015 23:00:14 -0000 1.13
+++ filters/lpf.c 25 Sep 2015 11:14:02 -0000
@@ -98,6 +98,7 @@ main(int argc, char **argv)
break;
default:
usage();
+ /* NOTREACHED */
}
}
argc -= optind;
@@ -206,7 +207,8 @@ main(int argc, char **argv)
freopen(acctfile, "a", stdout) != NULL) {
printf("%7.2f\t%s:%s\n", (float)npages, host, name);
}
- exit(0);
+
+ return (0);
}
__dead void
Index: lpc/lpc.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/lpc/lpc.c,v
retrieving revision 1.19
diff -u -p -r1.19 lpc.c
--- lpc/lpc.c 16 Jan 2015 06:40:18 -0000 1.19
+++ lpc/lpc.c 25 Sep 2015 11:14:02 -0000
@@ -103,6 +103,8 @@ main(int argc, char **argv)
signal(SIGINT, intr);
for (;;)
cmdscanner();
+
+ return 0;
}
volatile sig_atomic_t gotintr;
Index: lpd/lpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/lpd/lpd.c,v
retrieving revision 1.58
diff -u -p -r1.58 lpd.c
--- lpd/lpd.c 9 Feb 2015 23:00:14 -0000 1.58
+++ lpd/lpd.c 25 Sep 2015 11:14:02 -0000
@@ -203,7 +203,7 @@ main(int argc, char **argv)
break;
default:
usage();
- break;
+ /* NOTREACHED */
}
}
argc -= optind;
@@ -223,6 +223,7 @@ main(int argc, char **argv)
break;
default:
usage();
+ /* NOTREACHED */
}
#ifndef DEBUG
@@ -419,6 +420,8 @@ main(int argc, char **argv)
}
(void)close(s);
}
+
+ return 0;
}
static void
Index: lpq/lpq.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/lpq/lpq.c,v
retrieving revision 1.22
diff -u -p -r1.22 lpq.c
--- lpq/lpq.c 9 Feb 2015 23:00:14 -0000 1.22
+++ lpq/lpq.c 25 Sep 2015 11:14:02 -0000
@@ -108,6 +108,7 @@ main(int argc, char **argv)
case '?':
default:
usage();
+ /* NOTREACHED */
}
}
@@ -145,7 +146,8 @@ main(int argc, char **argv)
}
} else
displayq(lflag);
- exit(0);
+
+ return (0);
}
/* XXX - could be common w/ lpd */
Index: lpr/lpr.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/lpr/lpr.c,v
retrieving revision 1.48
diff -u -p -r1.48 lpr.c
--- lpr/lpr.c 9 Feb 2015 23:00:14 -0000 1.48
+++ lpr/lpr.c 25 Sep 2015 11:14:02 -0000
@@ -238,6 +238,7 @@ main(int argc, char **argv)
default:
usage();
+ /* NOTREACHED */
}
}
argc -= optind;
@@ -389,7 +390,6 @@ main(int argc, char **argv)
}
cleanup(0);
return (1);
- /* NOTREACHED */
}
/*
Index: lprm/lprm.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/lprm/lprm.c,v
retrieving revision 1.21
diff -u -p -r1.21 lprm.c
--- lprm/lprm.c 16 Jan 2015 06:40:18 -0000 1.21
+++ lprm/lprm.c 25 Sep 2015 11:14:02 -0000
@@ -122,6 +122,7 @@ main(int argc, char **argv)
break;
default:
usage();
+ /* NOTREACHED */
}
}
argc -= optind;
@@ -146,7 +147,7 @@ main(int argc, char **argv)
}
rmjob();
- exit(0);
+ return (0);
}
static __dead void
Index: lptest/lptest.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/lptest/lptest.c,v
retrieving revision 1.8
diff -u -p -r1.8 lptest.c
--- lptest/lptest.c 27 Oct 2009 23:59:52 -0000 1.8
+++ lptest/lptest.c 25 Sep 2015 11:14:02 -0000
@@ -66,5 +66,5 @@ main(int argc, char **argv)
putchar('\n');
}
(void)fflush(stdout);
- exit(0);
+ return (0);
}
Index: pac/pac.c
===================================================================
RCS file: /cvs/src/usr.sbin/lpr/pac/pac.c,v
retrieving revision 1.25
diff -u -p -r1.25 pac.c
--- pac/pac.c 20 Aug 2015 22:46:32 -0000 1.25
+++ pac/pac.c 25 Sep 2015 11:14:02 -0000
@@ -186,7 +186,8 @@ main(int argc, char **argv)
rewrite();
else
dumpit();
- exit(errs);
+
+ return (errs);
}
/*
