===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- docbook2mdoc/docbook2mdoc.c	2019/03/22 17:42:53	1.62
+++ docbook2mdoc/docbook2mdoc.c	2019/03/22 18:02:07	1.63
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.62 2019/03/22 17:42:53 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.63 2019/03/22 18:02:07 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -268,7 +268,7 @@ xml_char(void *arg, const XML_Char *p, int sz)
 		dat = calloc(1, sizeof(struct pnode));
 		if (NULL == dat) {
 			perror(NULL);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 
 		dat->node = ps->node = NODE_TEXT;
@@ -286,7 +286,7 @@ xml_char(void *arg, const XML_Char *p, int sz)
 		ps->cur->bsz + (size_t)sz);
 	if (NULL == ps->cur->b) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit(1);
 	}
 	memcpy(ps->cur->b + ps->cur->bsz, p, sz);
 	ps->cur->bsz += (size_t)sz;
@@ -366,7 +366,7 @@ xml_elem_start(void *arg, const XML_Char *name, const 
 
 	if (NULL == (dat = calloc(1, sizeof(struct pnode)))) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit(1);
 	}
 
 	dat->node = ps->node = node->node;
@@ -504,7 +504,7 @@ pnode_getattr(struct pnode *pn, enum attrkey key)
 	TAILQ_FOREACH(ap, &pn->attrq, child)
 		if (ap->key == key)
 			return ap->val;
-	return(ATTRVAL__MAX);
+	return ATTRVAL__MAX;
 }
 
 /*
@@ -520,7 +520,7 @@ pnode_getattr_raw(struct pnode *pn, enum attrkey key, 
 		if (ap->key == key)
 			return ATTRVAL__MAX == ap->val ? ap->rawval :
 			    attrvals[ap->val];
-	return(defval);
+	return defval;
 }
 
 /*
@@ -547,7 +547,7 @@ bufappend(struct parse *p, struct pnode *pn)
 		p->mbsz = p->bsz + pn->bsz + 1;
 		if (NULL == (p->b = realloc(p->b, p->mbsz))) {
 			perror(NULL);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	memcpy(p->b + p->bsz, pn->b, pn->bsz);
@@ -588,7 +588,7 @@ pnode_findfirst(struct pnode *pn, enum nodeid node)
 			break;
 	}
 
-	return(res);
+	return res;
 }
 
 #define MACROLINE_NORM	0
@@ -1719,14 +1719,14 @@ readfile(XML_Parser xp, int fd,
 		pnode_print(&p, p.root);
 		pnode_free(p.root);
 		free(p.b);
-		return(0 != rc && ! p.stop);
+		return rc != 0 && p.stop == 0;
 	}
 
 	/* Read error has occured. */
 	perror(fn);
 	pnode_free(p.root);
 	free(p.b);
-	return(0);
+	return 0;
 }
 
 int
@@ -1747,7 +1747,7 @@ main(int argc, char *argv[])
 	fname = "-";
 	xp = NULL;
 	buf = NULL;
-	rc = 0;
+	rc = 1;
 
 	while (-1 != (ch = getopt(argc, argv, "W")))
 		switch (ch) {
@@ -1783,16 +1783,16 @@ main(int argc, char *argv[])
 		perror(NULL);
 	else if (NULL == (xp = XML_ParserCreate(NULL)))
 		perror(NULL);
-	else if ( ! readfile(xp, fd, buf, 4096, fname))
-		rc = 1;
+	else if (readfile(xp, fd, buf, 4096, fname))
+		rc = 0;
 
 	XML_ParserFree(xp);
 	free(buf);
 	if (STDIN_FILENO != fd)
 		close(fd);
-	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
+	return rc;
 
 usage:
 	fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname);
-	return(EXIT_FAILURE);
+	return 1;
 }