More lint fixes.

Removed err.h from inclusions (less main.c--still in progress).

7 files changed, 8 insertions, 11 deletions

diff --git a/html.c b/html.c
index 77c73bb6..89cb375c 100644
--- a/html.c
+++ b/html.c
@@ -18,7 +18,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
diff --git a/man_html.c b/man_html.c
index 3504c9d7..b9a3166e 100644
--- a/man_html.c
+++ b/man_html.c
@@ -18,7 +18,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/man_term.c b/man_term.c
index 8ffa7cff..910aa4a1 100644
--- a/man_term.c
+++ b/man_term.c
@@ -18,7 +18,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/mdoc_html.c b/mdoc_html.c
index fb174758..3d635df2 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -19,7 +19,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -1115,8 +1114,10 @@ mdoc_bl_pre(MDOC_ARGS)
 		return(1);
 
 	ord = malloc(sizeof(struct ord));
-	if (NULL == ord)
-		err(EXIT_FAILURE, "malloc");
+	if (NULL == ord) {
+		fprintf(stderr, "memory exhausted\n");
+		exit(EXIT_FAILURE);
+	}
 	ord->cookie = n;
 	ord->pos = 1;
 	ord->next = h->ords.head;
diff --git a/mdoc_term.c b/mdoc_term.c
index c3daf7a3..15c3440f 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -18,7 +18,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/term.c b/term.c
index e7e91694..c14be224 100644
--- a/term.c
+++ b/term.c
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -147,9 +146,11 @@ term_flushln(struct termp *p)
 	assert(p->offset < p->rmargin);
 
 	maxvis = (int)(p->rmargin - p->offset) - overstep < 0 ?
-			0 : p->rmargin - p->offset - overstep;
+		/* LINTED */ 
+		0 : p->rmargin - p->offset - overstep;
 	mmax = (int)(p->maxrmargin - p->offset) - overstep < 0 ?
-			0 : p->maxrmargin - p->offset - overstep;
+		/* LINTED */
+		0 : p->maxrmargin - p->offset - overstep;
 
 	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
diff --git a/tree.c b/tree.c
index 6c37f309..21137e1f 100644
--- a/tree.c
+++ b/tree.c
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>