summaryrefslogtreecommitdiff
path: root/usr/src/cmd/deroff
diff options
context:
space:
mode:
authormuffin <none@none>2005-08-19 12:05:17 -0700
committermuffin <none@none>2005-08-19 12:05:17 -0700
commitb55148877d473978f0b46d593fd6213fa526fcc5 (patch)
tree94b497479fe49ff4fd4eedb7fa56275edb5551c1 /usr/src/cmd/deroff
parentb72c1761d7573be4804f5a97918dcb6d97eedfa5 (diff)
downloadillumos-joyent-b55148877d473978f0b46d593fd6213fa526fcc5.tar.gz
6269019 cmd/tbl and gcc don't get along
6269073 cmd/captoinfo and gcc don't get along 6269772 gcc and cmd/deroff don't get along 6272081 gcc and cmd/patch don't get along 6272746 gcc and cmd/regcmp don't get along
Diffstat (limited to 'usr/src/cmd/deroff')
-rw-r--r--usr/src/cmd/deroff/deroff.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/usr/src/cmd/deroff/deroff.c b/usr/src/cmd/deroff/deroff.c
index 73abe933fa..26656d682a 100644
--- a/usr/src/cmd/deroff/deroff.c
+++ b/usr/src/cmd/deroff/deroff.c
@@ -19,15 +19,14 @@
*
* CDDL HEADER END
*/
-/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
+/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
+/* All Rights Reserved */
+
#pragma ident "%Z%%M% %I% %E% SMI"
#include <assert.h>
@@ -122,14 +121,14 @@ static void putmac(char *, int);
static void putwords(int);
static void regline(int, int);
static void sce(void);
-static int skeqn();
+static int skeqn(void);
static void sdis(char, char);
static void stbl(void);
static void tbl(void);
static void usage(void);
-static void work(void);
+static void work(void) __NORETURN;
-void
+int
main(int ac, char **av)
{
int i;
@@ -166,8 +165,10 @@ main(int ac, char **av)
errflg++;
}
}
- if (errflg)
+ if (errflg) {
usage();
+ return (1);
+ }
if (optind == argc)
infile = stdin;
else
@@ -184,15 +185,12 @@ main(int ac, char **av)
chars['\''] = APOS;
chars['&'] = APOS;
work();
+ /* NOTREACHED */
}
-
-
-
-
static int
-skeqn()
+skeqn(void)
{
while ((c = getc(infile)) != rdelim) {
if (c == EOF) {
@@ -317,7 +315,6 @@ usage(void)
(void) fputs(gettext(
"usage: deroff [ -w ] [ -m (m s l) ] [ -i ] "
"[ file ] ... \n"), stderr);
- exit(1);
}
static void