In preparation for using clang's -Wcast-qual:

Use __DECONST (instead of my own attempted re-invention) for the iov
parameters to jail_get/set(2).  Similarly remove the decost-ish hack
from execvp's argv, except the __DECONST is only added at very end.

While I'm at it, remove an unused variable and fix a comment typo.

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/libjail/jail.c b/lib/libjail/jail.c
index 207b9f2936a33..0edfb3f33ac12 100644
--- a/lib/libjail/jail.c
+++ b/lib/libjail/jail.c
@@ -531,7 +531,7 @@ jailparam_set(struct jailparam *jp, unsigned njp, int flags)
 		}
 		i++;
 	}
-	*(const void **)&jiov[i].iov_base = "errmsg";
+	jiov[i].iov_base = __DECONST(char *, "errmsg");
 	jiov[i].iov_len = sizeof("errmsg");
 	i++;
 	jiov[i].iov_base = jail_errmsg;
@@ -601,7 +601,7 @@ jailparam_get(struct jailparam *jp, unsigned njp, int flags)
 	jiov[ki].iov_len = (jp_key->jp_ctltype & CTLTYPE) == CTLTYPE_STRING
 	    ? strlen(jp_key->jp_value) + 1 : jp_key->jp_valuelen;
 	ki++;
-	*(const void **)&jiov[ki].iov_base = "errmsg";
+	jiov[ki].iov_base = __DECONST(char *, "errmsg");
 	jiov[ki].iov_len = sizeof("errmsg");
 	ki++;
 	jiov[ki].iov_base = jail_errmsg;
diff --git a/lib/libjail/jail_getid.c b/lib/libjail/jail_getid.c
index fa1042407e69e..dab2dcf25ce84 100644
--- a/lib/libjail/jail_getid.c
+++ b/lib/libjail/jail_getid.c
@@ -53,12 +53,12 @@ jail_getid(const char *name)
 	jid = strtoul(name, &ep, 10);
 	if (*name && !*ep)
 		return jid;
-	*(const void **)&jiov[0].iov_base = "name";
+	jiov[0].iov_base = __DECONST(char *, "name");
 	jiov[0].iov_len = sizeof("name");
 	jiov[1].iov_len = strlen(name) + 1;
 	jiov[1].iov_base = alloca(jiov[1].iov_len);
 	strcpy(jiov[1].iov_base, name);
-	*(const void **)&jiov[2].iov_base = "errmsg";
+	jiov[2].iov_base = __DECONST(char *, "errmsg");
 	jiov[2].iov_len = sizeof("errmsg");
 	jiov[3].iov_base = jail_errmsg;
 	jiov[3].iov_len = JAIL_ERRMSGLEN;
@@ -80,15 +80,15 @@ jail_getname(int jid)
 	char *name;
 	char namebuf[MAXHOSTNAMELEN];
 
-	*(const void **)&jiov[0].iov_base = "jid";
+	jiov[0].iov_base = __DECONST(char *, "jid");
 	jiov[0].iov_len = sizeof("jid");
 	jiov[1].iov_base = &jid;
 	jiov[1].iov_len = sizeof(jid);
-	*(const void **)&jiov[2].iov_base = "name";
+	jiov[2].iov_base = __DECONST(char *, "name");
 	jiov[2].iov_len = sizeof("name");
 	jiov[3].iov_base = namebuf;
 	jiov[3].iov_len = sizeof(namebuf);
-	*(const void **)&jiov[4].iov_base = "errmsg";
+	jiov[4].iov_base = __DECONST(char *, "errmsg");
 	jiov[4].iov_len = sizeof("errmsg");
 	jiov[5].iov_base = jail_errmsg;
 	jiov[5].iov_len = JAIL_ERRMSGLEN;