===================================================================
RCS file: /cvs/mandoc/man_term.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- mandoc/man_term.c	2019/01/05 00:36:50	1.226
+++ mandoc/man_term.c	2019/01/05 01:29:32	1.227
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.226 2019/01/05 00:36:50 schwarze Exp $ */
+/*	$Id: man_term.c,v 1.227 2019/01/05 01:29:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -88,7 +88,6 @@ static	void		  post_IP(DECL_ARGS);
 static	void		  post_HP(DECL_ARGS);
 static	void		  post_RS(DECL_ARGS);
 static	void		  post_SH(DECL_ARGS);
-static	void		  post_SS(DECL_ARGS);
 static	void		  post_SY(DECL_ARGS);
 static	void		  post_TP(DECL_ARGS);
 static	void		  post_UR(DECL_ARGS);
@@ -96,7 +95,7 @@ static	void		  post_UR(DECL_ARGS);
 static const struct man_term_act man_term_acts[MAN_MAX - MAN_TH] = {
 	{ NULL, NULL, 0 }, /* TH */
 	{ pre_SH, post_SH, 0 }, /* SH */
-	{ pre_SS, post_SS, 0 }, /* SS */
+	{ pre_SS, post_SH, 0 }, /* SS */
 	{ pre_TP, post_TP, 0 }, /* TP */
 	{ pre_TP, post_TP, 0 }, /* TQ */
 	{ pre_abort, NULL, 0 }, /* LP */
@@ -145,9 +144,9 @@ man_term_act(enum roff_tok tok)
 void
 terminal_man(void *arg, const struct roff_meta *man)
 {
+	struct mtermp		 mt;
 	struct termp		*p;
 	struct roff_node	*n;
-	struct mtermp		 mt;
 	size_t			 save_defindent;
 
 	p = (struct termp *)arg;
@@ -159,7 +158,7 @@ terminal_man(void *arg, const struct roff_meta *man)
 	term_tab_set(p, "T");
 	term_tab_set(p, ".5i");
 
-	memset(&mt, 0, sizeof(struct mtermp));
+	memset(&mt, 0, sizeof(mt));
 	mt.lmargin[mt.lmargincur] = term_len(p, p->defindent);
 	mt.offset = term_len(p, p->defindent);
 	mt.pardist = 1;
@@ -203,12 +202,12 @@ print_bvspace(struct termp *p, const struct roff_node 
 
 	term_newln(p);
 
-	if (n->body && n->body->child)
+	if (n->body != NULL && n->body->child != NULL)
 		if (n->body->child->type == ROFFT_TBL)
 			return;
 
 	if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
-		if (NULL == n->prev)
+		if (n->prev == NULL)
 			return;
 
 	for (i = 0; i < pardist; i++)
@@ -225,14 +224,12 @@ pre_abort(DECL_ARGS)
 static int
 pre_ign(DECL_ARGS)
 {
-
 	return 0;
 }
 
 static int
 pre_I(DECL_ARGS)
 {
-
 	term_fontrepl(p, TERMFONT_UNDER);
 	return 1;
 }
@@ -314,7 +311,7 @@ pre_alternate(DECL_ARGS)
 		term_word(p, nn->string);
 		if (nn->flags & NODE_EOS)
                 	p->flags |= TERMP_SENTENCE;
-		if (nn->next)
+		if (nn->next != NULL)
 			p->flags |= TERMP_NOSPACE;
 	}
 	return 0;
@@ -323,7 +320,6 @@ pre_alternate(DECL_ARGS)
 static int
 pre_B(DECL_ARGS)
 {
-
 	term_fontrepl(p, TERMFONT_BOLD);
 	return 1;
 }
@@ -331,19 +327,17 @@ pre_B(DECL_ARGS)
 static int
 pre_OP(DECL_ARGS)
 {
-
 	term_word(p, "[");
 	p->flags |= TERMP_KEEP | TERMP_NOSPACE;
 
-	if (NULL != (n = n->child)) {
+	if ((n = n->child) != NULL) {
 		term_fontrepl(p, TERMFONT_BOLD);
 		term_word(p, n->string);
 	}
-	if (NULL != n && NULL != n->next) {
+	if (n != NULL && n->next != NULL) {
 		term_fontrepl(p, TERMFONT_UNDER);
 		term_word(p, n->next->string);
 	}
-
 	term_fontrepl(p, TERMFONT_NONE);
 	p->flags &= ~TERMP_KEEP;
 	p->flags |= TERMP_NOSPACE;
@@ -369,9 +363,9 @@ pre_in(DECL_ARGS)
 	cp = n->child->string;
 	less = 0;
 
-	if ('-' == *cp)
+	if (*cp == '-')
 		less = -1;
-	else if ('+' == *cp)
+	else if (*cp == '+')
 		less = 1;
 	else
 		cp--;
@@ -413,10 +407,12 @@ pre_HP(DECL_ARGS)
 	case ROFFT_BLOCK:
 		print_bvspace(p, n, mt->pardist);
 		return 1;
+	case ROFFT_HEAD:
+		return 0;
 	case ROFFT_BODY:
 		break;
 	default:
-		return 0;
+		abort();
 	}
 
 	if (n->child == NULL)
@@ -448,8 +444,10 @@ pre_HP(DECL_ARGS)
 static void
 post_HP(DECL_ARGS)
 {
-
 	switch (n->type) {
+	case ROFFT_BLOCK:
+	case ROFFT_HEAD:
+		break;
 	case ROFFT_BODY:
 		term_newln(p);
 
@@ -469,25 +467,27 @@ post_HP(DECL_ARGS)
 		p->tcol->rmargin = p->maxrmargin;
 		break;
 	default:
-		break;
+		abort();
 	}
 }
 
 static int
 pre_PP(DECL_ARGS)
 {
-
 	switch (n->type) {
 	case ROFFT_BLOCK:
 		mt->lmargin[mt->lmargincur] = term_len(p, p->defindent);
 		print_bvspace(p, n, mt->pardist);
 		break;
-	default:
+	case ROFFT_HEAD:
+		return 0;
+	case ROFFT_BODY:
 		p->tcol->offset = mt->offset;
 		break;
+	default:
+		abort();
 	}
-
-	return n->type != ROFFT_HEAD;
+	return 1;
 }
 
 static int
@@ -498,18 +498,18 @@ pre_IP(DECL_ARGS)
 	int			 len;
 
 	switch (n->type) {
-	case ROFFT_BODY:
-		p->flags |= TERMP_NOSPACE;
-		break;
+	case ROFFT_BLOCK:
+		print_bvspace(p, n, mt->pardist);
+		return 1;
 	case ROFFT_HEAD:
 		p->flags |= TERMP_NOBREAK;
 		p->trailspace = 1;
 		break;
-	case ROFFT_BLOCK:
-		print_bvspace(p, n, mt->pardist);
-		/* FALLTHROUGH */
+	case ROFFT_BODY:
+		p->flags |= TERMP_NOSPACE;
+		break;
 	default:
-		return 1;
+		abort();
 	}
 
 	/* Calculate the offset from the optional second argument. */
@@ -529,7 +529,7 @@ pre_IP(DECL_ARGS)
 	case ROFFT_HEAD:
 		p->tcol->offset = mt->offset;
 		p->tcol->rmargin = mt->offset + len;
-		if (n->child)
+		if (n->child != NULL)
 			print_man_node(p, mt, n->child, meta);
 		return 0;
 	case ROFFT_BODY:
@@ -537,7 +537,7 @@ pre_IP(DECL_ARGS)
 		p->tcol->rmargin = p->maxrmargin;
 		break;
 	default:
-		break;
+		abort();
 	}
 	return 1;
 }
@@ -546,6 +546,8 @@ static void
 post_IP(DECL_ARGS)
 {
 	switch (n->type) {
+	case ROFFT_BLOCK:
+		break;
 	case ROFFT_HEAD:
 		term_flushln(p);
 		p->flags &= ~TERMP_NOBREAK;
@@ -557,7 +559,7 @@ post_IP(DECL_ARGS)
 		p->tcol->offset = mt->offset;
 		break;
 	default:
-		break;
+		abort();
 	}
 }
 
@@ -569,6 +571,10 @@ pre_TP(DECL_ARGS)
 	int			 len;
 
 	switch (n->type) {
+	case ROFFT_BLOCK:
+		if (n->tok == MAN_TP)
+			print_bvspace(p, n, mt->pardist);
+		return 1;
 	case ROFFT_HEAD:
 		p->flags |= TERMP_NOBREAK | TERMP_BRTRSP;
 		p->trailspace = 1;
@@ -576,12 +582,8 @@ pre_TP(DECL_ARGS)
 	case ROFFT_BODY:
 		p->flags |= TERMP_NOSPACE;
 		break;
-	case ROFFT_BLOCK:
-		if (n->tok == MAN_TP)
-			print_bvspace(p, n, mt->pardist);
-		/* FALLTHROUGH */
 	default:
-		return 1;
+		abort();
 	}
 
 	/* Calculate offset. */
@@ -605,10 +607,10 @@ pre_TP(DECL_ARGS)
 
 		/* Don't print same-line elements. */
 		nn = n->child;
-		while (NULL != nn && 0 == (NODE_LINE & nn->flags))
+		while (nn != NULL && (nn->flags & NODE_LINE) == 0)
 			nn = nn->next;
 
-		while (NULL != nn) {
+		while (nn != NULL) {
 			print_man_node(p, mt, nn, meta);
 			nn = nn->next;
 		}
@@ -620,7 +622,7 @@ pre_TP(DECL_ARGS)
 		p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP);
 		break;
 	default:
-		break;
+		abort();
 	}
 	return 1;
 }
@@ -629,6 +631,8 @@ static void
 post_TP(DECL_ARGS)
 {
 	switch (n->type) {
+	case ROFFT_BLOCK:
+		break;
 	case ROFFT_HEAD:
 		term_flushln(p);
 		break;
@@ -637,7 +641,7 @@ post_TP(DECL_ARGS)
 		p->tcol->offset = mt->offset;
 		break;
 	default:
-		break;
+		abort();
 	}
 }
 
@@ -683,26 +687,9 @@ pre_SS(DECL_ARGS)
 	default:
 		break;
 	}
-
 	return 1;
 }
 
-static void
-post_SS(DECL_ARGS)
-{
-
-	switch (n->type) {
-	case ROFFT_HEAD:
-		term_newln(p);
-		break;
-	case ROFFT_BODY:
-		term_newln(p);
-		break;
-	default:
-		break;
-	}
-}
-
 static int
 pre_SH(DECL_ARGS)
 {
@@ -743,25 +730,23 @@ pre_SH(DECL_ARGS)
 		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
 		break;
 	default:
-		break;
+		abort();
 	}
-
 	return 1;
 }
 
 static void
 post_SH(DECL_ARGS)
 {
-
 	switch (n->type) {
-	case ROFFT_HEAD:
-		term_newln(p);
+	case ROFFT_BLOCK:
 		break;
+	case ROFFT_HEAD:
 	case ROFFT_BODY:
 		term_newln(p);
 		break;
 	default:
-		break;
+		abort();
 	}
 }
 
@@ -776,8 +761,10 @@ pre_RS(DECL_ARGS)
 		return 1;
 	case ROFFT_HEAD:
 		return 0;
-	default:
+	case ROFFT_BODY:
 		break;
+	default:
+		abort();
 	}
 
 	n = n->parent->head;
@@ -805,20 +792,18 @@ pre_RS(DECL_ARGS)
 static void
 post_RS(DECL_ARGS)
 {
-
 	switch (n->type) {
 	case ROFFT_BLOCK:
-		return;
 	case ROFFT_HEAD:
 		return;
-	default:
-		term_newln(p);
+	case ROFFT_BODY:
 		break;
+	default:
+		abort();
 	}
-
+	term_newln(p);
 	mt->offset -= n->parent->head->aux;
 	p->tcol->offset = mt->offset;
-
 	if (--mt->lmarginsz < MAXMARGINS)
 		mt->lmargincur = mt->lmarginsz;
 }
@@ -867,6 +852,8 @@ static void
 post_SY(DECL_ARGS)
 {
 	switch (n->type) {
+	case ROFFT_BLOCK:
+		break;
 	case ROFFT_HEAD:
 		term_flushln(p);
 		p->flags &= ~TERMP_NOBREAK;
@@ -876,28 +863,26 @@ post_SY(DECL_ARGS)
 		p->tcol->offset = mt->offset;
 		break;
 	default:
-		break;
+		abort();
 	}
 }
 
 static int
 pre_UR(DECL_ARGS)
 {
-
 	return n->type != ROFFT_HEAD;
 }
 
 static void
 post_UR(DECL_ARGS)
 {
-
 	if (n->type != ROFFT_BLOCK)
 		return;
 
 	term_word(p, "<");
 	p->flags |= TERMP_NOSPACE;
 
-	if (NULL != n->child->child)
+	if (n->child->child != NULL)
 		print_man_node(p, mt, n->child->child, meta);
 
 	p->flags |= TERMP_NOSPACE;
@@ -962,7 +947,7 @@ print_man_node(DECL_ARGS)
 	if (act->pre != NULL)
 		c = (*act->pre)(p, mt, n, meta);
 
-	if (c && n->child)
+	if (c && n->child != NULL)
 		print_man_nodelist(p, mt, n->child, meta);
 
 	if (act->post != NULL)
@@ -993,15 +978,13 @@ out:
 			p->tcol->rmargin = p->maxrmargin;
 		}
 	}
-	if (NODE_EOS & n->flags)
+	if (n->flags & NODE_EOS)
 		p->flags |= TERMP_SENTENCE;
 }
 
-
 static void
 print_man_nodelist(DECL_ARGS)
 {
-
 	while (n != NULL) {
 		print_man_node(p, mt, n, meta);
 		n = n->next;
@@ -1036,7 +1019,7 @@ print_man_foot(struct termp *p, const struct roff_meta
 		}
 		mandoc_asprintf(&title, "%s(%s)",
 		    meta->title, meta->msec);
-	} else if (meta->os) {
+	} else if (meta->os != NULL) {
 		title = mandoc_strdup(meta->os);
 	} else {
 		title = mandoc_strdup("");