Cleanup suggested by gcc-4.8.1, following hints by Christos Zoulas:

- avoid bad qualifier casting in roff.c, roff_parsetext()
  by changing the mandoc_escape arguments to "const char const **"
- avoid bad qualifier casting in mandocdb.c, index_merge()
- do not complain about unused variables in test-*.c
- garbage collect a few unused variables elsewhere

5 files changed, 6 insertions, 8 deletions

diff --git a/mandoc.3 b/mandoc.3
index ac641b48..f5752c74 100644
--- a/mandoc.3
+++ b/mandoc.3
@@ -50,8 +50,8 @@
 .In mandoc.h
 .Ft "enum mandoc_esc"
 .Fo mandoc_escape
-.Fa "const char **end"
-.Fa "const char **start"
+.Fa "const char const **end"
+.Fa "const char const **start"
 .Fa "int *sz"
 .Fc
 .Ft "const struct man_meta *"
diff --git a/mandoc.c b/mandoc.c
index b8800d99..fab0c440 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -40,7 +40,7 @@ static	char	*time2a(time_t);
 
 
 enum mandoc_esc
-mandoc_escape(const char **end, const char **start, int *sz)
+mandoc_escape(const char const **end, const char const **start, int *sz)
 {
 	const char	*local_start;
 	int		 local_sz;
diff --git a/mandoc.h b/mandoc.h
index 7b7e4f41..138f783b 100644
--- a/mandoc.h
+++ b/mandoc.h
@@ -400,7 +400,8 @@ struct	man;
 __BEGIN_DECLS
 
 void		 *mandoc_calloc(size_t, size_t);
-enum mandoc_esc	  mandoc_escape(const char **, const char **, int *);
+enum mandoc_esc	  mandoc_escape(const char const **,
+			const char const **, int *);
 void		 *mandoc_malloc(size_t);
 void		 *mandoc_realloc(void *, size_t);
 char		 *mandoc_strdup(const char *);
diff --git a/out.c b/out.c
index 937458dd..866e05b3 100644
--- a/out.c
+++ b/out.c
@@ -142,7 +142,6 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 {
 	const struct tbl_dat	*dp;
-	const struct tbl_head	*hp;
 	struct roffcol		*col;
 	int			 spans;
 
@@ -156,8 +155,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 	tbl->cols = mandoc_calloc
 		((size_t)sp->opts->cols, sizeof(struct roffcol));
 
-	hp = sp->head;
-
 	for ( ; sp; sp = sp->next) {
 		if (TBL_SPAN_DATA != sp->pos)
 			continue;
diff --git a/roff.c b/roff.c
index 8a37326d..3c959328 100644
--- a/roff.c
+++ b/roff.c
@@ -627,7 +627,7 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
 			/* Skip over escapes. */
 			p++;
 			esc = mandoc_escape
-				((const char **)&p, NULL, NULL);
+				((const char const **)&p, NULL, NULL);
 			if (ESCAPE_ERROR == esc)
 				break;
 			continue;