KNF: case (FOO): -> case FOO:, remove /* LINTED */ and /* ARGSUSED */,

remove trailing whitespace and blanks before tabs, improve some indenting;
no functional change

1 files changed, 59 insertions, 67 deletions

diff --git a/html.c b/html.c
index 32c31e50..7319de66 100644
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.155 2014/03/23 11:25:26 schwarze Exp $ */
+/*	$Id: html.c,v 1.156 2014/04/20 16:46:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -115,6 +115,7 @@ static	void	 print_metaf(struct html *, enum mandoc_esc);
 static	void	 print_attr(struct html *, const char *, const char *);
 static	void	 *ml_alloc(char *, enum htmltype);
 
+
 static void *
 ml_alloc(char *outopts, enum htmltype type)
 {
@@ -136,16 +137,16 @@ ml_alloc(char *outopts, enum htmltype type)
 
 	while (outopts && *outopts)
 		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-		case (0):
+		case 0:
 			h->style = v;
 			break;
-		case (1):
+		case 1:
 			h->base_man = v;
 			break;
-		case (2):
+		case 2:
 			h->base_includes = v;
 			break;
-		case (3):
+		case 3:
 			h->oflags |= HTML_FRAGMENT;
 			break;
 		default:
@@ -162,7 +163,6 @@ html_alloc(char *outopts)
 	return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
 }
 
-
 void *
 xhtml_alloc(char *outopts)
 {
@@ -170,7 +170,6 @@ xhtml_alloc(char *outopts)
 	return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
 }
 
-
 void
 html_free(void *p)
 {
@@ -180,17 +179,16 @@ html_free(void *p)
 	h = (struct html *)p;
 
 	while ((tag = h->tags.head) != NULL) {
-		h->tags.head = tag->next;	
+		h->tags.head = tag->next;
 		free(tag);
 	}
-	
+
 	if (h->symtab)
 		mchars_free(h->symtab);
 
 	free(h);
 }
 
-
 void
 print_gen_head(struct html *h)
 {
@@ -227,21 +225,21 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 	enum htmlfont	 font;
 
 	switch (deco) {
-	case (ESCAPE_FONTPREV):
+	case ESCAPE_FONTPREV:
 		font = h->metal;
 		break;
-	case (ESCAPE_FONTITALIC):
+	case ESCAPE_FONTITALIC:
 		font = HTMLFONT_ITALIC;
 		break;
-	case (ESCAPE_FONTBOLD):
+	case ESCAPE_FONTBOLD:
 		font = HTMLFONT_BOLD;
 		break;
-	case (ESCAPE_FONTBI):
+	case ESCAPE_FONTBI:
 		font = HTMLFONT_BI;
 		break;
-	case (ESCAPE_FONT):
+	case ESCAPE_FONT:
 		/* FALLTHROUGH */
-	case (ESCAPE_FONTROMAN):
+	case ESCAPE_FONTROMAN:
 		font = HTMLFONT_NONE;
 		break;
 	default:
@@ -258,13 +256,13 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 	h->metac = font;
 
 	switch (font) {
-	case (HTMLFONT_ITALIC):
+	case HTMLFONT_ITALIC:
 		h->metaf = print_otag(h, TAG_I, 0, NULL);
 		break;
-	case (HTMLFONT_BOLD):
+	case HTMLFONT_BOLD:
 		h->metaf = print_otag(h, TAG_B, 0, NULL);
 		break;
-	case (HTMLFONT_BI):
+	case HTMLFONT_BI:
 		h->metaf = print_otag(h, TAG_B, 0, NULL);
 		print_otag(h, TAG_I, 0, NULL);
 		break;
@@ -303,19 +301,19 @@ html_strlen(const char *cp)
 			break;
 		cp++;
 		switch (mandoc_escape(&cp, NULL, NULL)) {
-		case (ESCAPE_ERROR):
+		case ESCAPE_ERROR:
 			return(sz);
-		case (ESCAPE_UNICODE):
+		case ESCAPE_UNICODE:
 			/* FALLTHROUGH */
-		case (ESCAPE_NUMBERED):
+		case ESCAPE_NUMBERED:
 			/* FALLTHROUGH */
-		case (ESCAPE_SPECIAL):
+		case ESCAPE_SPECIAL:
 			if (skip)
 				skip = 0;
 			else
 				sz++;
 			break;
-		case (ESCAPE_SKIPCHAR):
+		case ESCAPE_SKIPCHAR:
 			skip = 1;
 			break;
 		default:
@@ -353,22 +351,22 @@ print_encode(struct html *h, const char *p, int norecurse)
 			break;
 
 		switch (*p++) {
-		case ('<'):
+		case '<':
 			printf("&lt;");
 			continue;
-		case ('>'):
+		case '>':
 			printf("&gt;");
 			continue;
-		case ('&'):
+		case '&':
 			printf("&amp;");
 			continue;
-		case (ASCII_NBRSP):
+		case ASCII_NBRSP:
 			putchar('-');
 			continue;
-		case (ASCII_HYPH):
+		case ASCII_HYPH:
 			putchar('-');
 			/* FALLTHROUGH */
-		case (ASCII_BREAK):
+		case ASCII_BREAK:
 			continue;
 		default:
 			break;
@@ -379,21 +377,21 @@ print_encode(struct html *h, const char *p, int norecurse)
 			break;
 
 		switch (esc) {
-		case (ESCAPE_FONT):
+		case ESCAPE_FONT:
 			/* FALLTHROUGH */
-		case (ESCAPE_FONTPREV):
+		case ESCAPE_FONTPREV:
 			/* FALLTHROUGH */
-		case (ESCAPE_FONTBOLD):
+		case ESCAPE_FONTBOLD:
 			/* FALLTHROUGH */
-		case (ESCAPE_FONTITALIC):
+		case ESCAPE_FONTITALIC:
 			/* FALLTHROUGH */
-		case (ESCAPE_FONTBI):
+		case ESCAPE_FONTBI:
 			/* FALLTHROUGH */
-		case (ESCAPE_FONTROMAN):
+		case ESCAPE_FONTROMAN:
 			if (0 == norecurse)
 				print_metaf(h, esc);
 			continue;
-		case (ESCAPE_SKIPCHAR):
+		case ESCAPE_SKIPCHAR:
 			h->flags |= HTML_SKIPCHAR;
 			continue;
 		default:
@@ -406,25 +404,25 @@ print_encode(struct html *h, const char *p, int norecurse)
 		}
 
 		switch (esc) {
-		case (ESCAPE_UNICODE):
+		case ESCAPE_UNICODE:
 			/* Skip passed "u" header. */
 			c = mchars_num2uc(seq + 1, len - 1);
 			if ('\0' != c)
 				printf("&#x%x;", c);
 			break;
-		case (ESCAPE_NUMBERED):
+		case ESCAPE_NUMBERED:
 			c = mchars_num2char(seq, len);
 			if ('\0' != c)
 				putchar(c);
 			break;
-		case (ESCAPE_SPECIAL):
+		case ESCAPE_SPECIAL:
 			c = mchars_spec2cp(h->symtab, seq, len);
 			if (c > 0)
 				printf("&#%d;", c);
 			else if (-1 == c && 1 == len)
 				putchar((int)*seq);
 			break;
-		case (ESCAPE_NOSPACE):
+		case ESCAPE_NOSPACE:
 			if ('\0' == *p)
 				nospace = 1;
 			break;
@@ -436,7 +434,6 @@ print_encode(struct html *h, const char *p, int norecurse)
 	return(nospace);
 }
 
-
 static void
 print_attr(struct html *h, const char *key, const char *val)
 {
@@ -445,9 +442,8 @@ print_attr(struct html *h, const char *key, const char *val)
 	putchar('\"');
 }
 
-
 struct tag *
-print_otag(struct html *h, enum htmltag tag, 
+print_otag(struct html *h, enum htmltag tag,
 		int sz, const struct htmlpair *p)
 {
 	int		 i;
@@ -497,7 +493,7 @@ print_otag(struct html *h, enum htmltag tag,
 
 	if (HTML_AUTOCLOSE & htmltags[tag].flags)
 		switch (h->type) {
-		case (HTML_XHTML_1_0_STRICT):
+		case HTML_XHTML_1_0_STRICT:
 			putchar('/');
 			break;
 		default:
@@ -514,16 +510,15 @@ print_otag(struct html *h, enum htmltag tag,
 	return(t);
 }
 
-
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
-	
+
 	printf("</%s>", htmltags[tag].name);
 	if (HTML_CLRLINE & htmltags[tag].flags) {
 		h->flags |= HTML_NOSPACE;
 		putchar('\n');
-	} 
+	}
 }
 
 void
@@ -534,7 +529,7 @@ print_gen_decls(struct html *h)
 	const char	*name;
 
 	switch (h->type) {
-	case (HTML_HTML_4_01_STRICT):
+	case HTML_HTML_4_01_STRICT:
 		name = "HTML";
 		doctype = "-//W3C//DTD HTML 4.01//EN";
 		dtd = "http://www.w3.org/TR/html4/strict.dtd";
@@ -547,8 +542,8 @@ print_gen_decls(struct html *h)
 		break;
 	}
 
-	printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n", 
-			name, doctype, dtd);
+	printf("<!DOCTYPE %s PUBLIC \"%s\" \"%s\">\n",
+	    name, doctype, dtd);
 }
 
 void
@@ -567,13 +562,13 @@ print_text(struct html *h, const char *word)
 
 	assert(NULL == h->metaf);
 	switch (h->metac) {
-	case (HTMLFONT_ITALIC):
+	case HTMLFONT_ITALIC:
 		h->metaf = print_otag(h, TAG_I, 0, NULL);
 		break;
-	case (HTMLFONT_BOLD):
+	case HTMLFONT_BOLD:
 		h->metaf = print_otag(h, TAG_B, 0, NULL);
 		break;
-	case (HTMLFONT_BI):
+	case HTMLFONT_BI:
 		h->metaf = print_otag(h, TAG_B, 0, NULL);
 		print_otag(h, TAG_I, 0, NULL);
 		break;
@@ -596,14 +591,13 @@ print_text(struct html *h, const char *word)
 	h->flags &= ~HTML_IGNDELIM;
 }
 
-
 void
 print_tagq(struct html *h, const struct tag *until)
 {
 	struct tag	*tag;
 
 	while ((tag = h->tags.head) != NULL) {
-		/* 
+		/*
 		 * Remember to close out and nullify the current
 		 * meta-font and table, if applicable.
 		 */
@@ -619,7 +613,6 @@ print_tagq(struct html *h, const struct tag *until)
 	}
 }
 
-
 void
 print_stagq(struct html *h, const struct tag *suntil)
 {
@@ -628,7 +621,7 @@ print_stagq(struct html *h, const struct tag *suntil)
 	while ((tag = h->tags.head) != NULL) {
 		if (suntil && tag == suntil)
 			return;
-		/* 
+		/*
 		 * Remember to close out and nullify the current
 		 * meta-font and table, if applicable.
 		 */
@@ -674,8 +667,8 @@ bufcat_fmt(struct html *h, const char *fmt, ...)
 	va_list		 ap;
 
 	va_start(ap, fmt);
-	(void)vsnprintf(h->buf + (int)h->buflen, 
-			BUFSIZ - h->buflen - 1, fmt, ap);
+	(void)vsnprintf(h->buf + (int)h->buflen,
+	    BUFSIZ - h->buflen - 1, fmt, ap);
 	va_end(ap);
 	h->buflen = strlen(h->buf);
 }
@@ -695,12 +688,12 @@ buffmt_includes(struct html *h, const char *name)
 	const char	*p, *pp;
 
 	pp = h->base_includes;
-	
+
 	bufinit(h);
 	while (NULL != (p = strchr(pp, '%'))) {
 		bufncat(h, pp, (size_t)(p - pp));
 		switch (*(p + 1)) {
-		case('I'):
+		case'I':
 			bufcat(h, name);
 			break;
 		default:
@@ -714,21 +707,20 @@ buffmt_includes(struct html *h, const char *name)
 }
 
 void
-buffmt_man(struct html *h, 
-		const char *name, const char *sec)
+buffmt_man(struct html *h, const char *name, const char *sec)
 {
 	const char	*p, *pp;
 
 	pp = h->base_man;
-	
+
 	bufinit(h);
 	while (NULL != (p = strchr(pp, '%'))) {
 		bufncat(h, pp, (size_t)(p - pp));
 		switch (*(p + 1)) {
-		case('S'):
+		case 'S':
 			bufcat(h, sec ? sec : "1");
 			break;
-		case('N'):
+		case 'N':
 			bufcat_fmt(h, "%s", name);
 			break;
 		default: