diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /lib/libjail | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'lib/libjail')
| -rw-r--r-- | lib/libjail/jail.c | 4 | ||||
| -rw-r--r-- | lib/libjail/jail_getid.c | 10 |
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; |