From fd6f541ce489626cb695b97a00cee1e243aa40a4 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Tue, 13 Oct 2009 10:21:24 +0000
Subject: Clean up consts (noted by Joerg Sonnenberger and Ulrich Sporlein).

---
 main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index b9d9da81..aadd86ac 100644
--- a/main.c
+++ b/main.c
@@ -20,6 +20,7 @@
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -27,6 +28,8 @@
 #include "mdoc.h"
 #include "man.h"
 
+#define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
+
 /* Account for FreeBSD and Linux in our declarations. */
 
 #ifdef __linux__
@@ -576,7 +579,7 @@ static int
 foptions(int *fflags, char *arg)
 {
 	char		*v, *o;
-	char		*toks[7];
+	const char	*toks[7];
 
 	toks[0] = "ign-scope";
 	toks[1] = "no-ign-escape";
@@ -588,7 +591,7 @@ foptions(int *fflags, char *arg)
 
 	while (*arg) {
 		o = arg;
-		switch (getsubopt(&arg, toks, &v)) {
+		switch (getsubopt(&arg, UNCONST(toks), &v)) {
 		case (0):
 			*fflags |= IGN_SCOPE;
 			break;
@@ -622,7 +625,7 @@ static int
 woptions(int *wflags, char *arg)
 {
 	char		*v, *o;
-	char		*toks[3]; 
+	const char	*toks[3]; 
 
 	toks[0] = "all";
 	toks[1] = "error";
@@ -630,7 +633,7 @@ woptions(int *wflags, char *arg)
 
 	while (*arg) {
 		o = arg;
-		switch (getsubopt(&arg, toks, &v)) {
+		switch (getsubopt(&arg, UNCONST(toks), &v)) {
 		case (0):
 			*wflags |= WARN_WALL;
 			break;
-- 
cgit