From owner-svn-src-user@freebsd.org Mon Jan 18 04:32:20 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8FC40A86557
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 18 Jan 2016 04:32:20 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 4E0CC154F;
Mon, 18 Jan 2016 04:32:20 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0I4WJA2008710;
Mon, 18 Jan 2016 04:32:19 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0I4WJYa008708;
Mon, 18 Jan 2016 04:32:19 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601180432.u0I4WJYa008708@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Mon, 18 Jan 2016 04:32:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294246 -
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2016 04:32:20 -0000
Author: ngie
Date: Mon Jan 18 04:32:19 2016
New Revision: 294246
URL: https://svnweb.freebsd.org/changeset/base/294246
Log:
Checkpoint work to bump WARNS to 6
Try to fix -Wcast-align issues by using bcopy to assign the values in
the structure.
The testcase fails more now, but it was failing prior to the change (1 vs
3 failures)
Modified:
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile
user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile Mon Jan 18 04:24:43 2016 (r294245)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/Makefile Mon Jan 18 04:32:19 2016 (r294246)
@@ -2,6 +2,6 @@
PROG= unix_cmsg
MAN=
-WARNS?= 3
+WARNS?= 6
.include <bsd.prog.mk>
Modified: user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c
==============================================================================
--- user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:24:43 2016 (r294245)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c Mon Jan 18 04:32:19 2016 (r294246)
@@ -1027,60 +1027,60 @@ check_xucred(const struct xucred *xucred
static int
check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
{
- const struct cmsgcred *cmsgcred;
+ struct cmsgcred cmsgcred;
- if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(*cmsgcred)) < 0)
+ if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(cmsgcred)) < 0)
return (-1);
- cmsgcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
+ bcopy(&cmsgcred, CMSG_DATA(cmsghdr), sizeof(struct cmsgcred));
- dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred->cmcred_pid);
- dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred->cmcred_uid);
- dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred->cmcred_euid);
- dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred->cmcred_gid);
- dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred->cmcred_ngroups);
+ dbgmsg("cmsgcred.cmcred_pid %ld", (long)cmsgcred.cmcred_pid);
+ dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmsgcred.cmcred_uid);
+ dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmsgcred.cmcred_euid);
+ dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmsgcred.cmcred_gid);
+ dbgmsg("cmsgcred.cmcred_ngroups %d", cmsgcred.cmcred_ngroups);
- if (cmsgcred->cmcred_pid != client_pid) {
+ if (cmsgcred.cmcred_pid != client_pid) {
logmsgx("cmsgcred.cmcred_pid %ld != %ld",
- (long)cmsgcred->cmcred_pid, (long)client_pid);
+ (long)cmsgcred.cmcred_pid, (long)client_pid);
return (-1);
}
- if (cmsgcred->cmcred_uid != proc_cred.uid) {
+ if (cmsgcred.cmcred_uid != proc_cred.uid) {
logmsgx("cmsgcred.cmcred_uid %lu != %lu",
- (u_long)cmsgcred->cmcred_uid, (u_long)proc_cred.uid);
+ (u_long)cmsgcred.cmcred_uid, (u_long)proc_cred.uid);
return (-1);
}
- if (cmsgcred->cmcred_euid != proc_cred.euid) {
+ if (cmsgcred.cmcred_euid != proc_cred.euid) {
logmsgx("cmsgcred.cmcred_euid %lu != %lu",
- (u_long)cmsgcred->cmcred_euid, (u_long)proc_cred.euid);
+ (u_long)cmsgcred.cmcred_euid, (u_long)proc_cred.euid);
return (-1);
}
- if (cmsgcred->cmcred_gid != proc_cred.gid) {
+ if (cmsgcred.cmcred_gid != proc_cred.gid) {
logmsgx("cmsgcred.cmcred_gid %lu != %lu",
- (u_long)cmsgcred->cmcred_gid, (u_long)proc_cred.gid);
+ (u_long)cmsgcred.cmcred_gid, (u_long)proc_cred.gid);
return (-1);
}
- if (cmsgcred->cmcred_ngroups == 0) {
+ if (cmsgcred.cmcred_ngroups == 0) {
logmsgx("cmsgcred.cmcred_ngroups == 0");
return (-1);
}
- if (cmsgcred->cmcred_ngroups < 0) {
+ if (cmsgcred.cmcred_ngroups < 0) {
logmsgx("cmsgcred.cmcred_ngroups %d < 0",
- cmsgcred->cmcred_ngroups);
+ cmsgcred.cmcred_ngroups);
return (-1);
}
- if (cmsgcred->cmcred_ngroups > CMGROUP_MAX) {
+ if (cmsgcred.cmcred_ngroups > CMGROUP_MAX) {
logmsgx("cmsgcred.cmcred_ngroups %d > %d",
- cmsgcred->cmcred_ngroups, CMGROUP_MAX);
+ cmsgcred.cmcred_ngroups, CMGROUP_MAX);
return (-1);
}
- if (cmsgcred->cmcred_groups[0] != proc_cred.egid) {
+ if (cmsgcred.cmcred_groups[0] != proc_cred.egid) {
logmsgx("cmsgcred.cmcred_groups[0] %lu != %lu (EGID)",
- (u_long)cmsgcred->cmcred_groups[0], (u_long)proc_cred.egid);
+ (u_long)cmsgcred.cmcred_groups[0], (u_long)proc_cred.egid);
return (-1);
}
- if (check_groups("cmsgcred.cmcred_groups", cmsgcred->cmcred_groups,
- "cmsgcred.cmcred_ngroups", cmsgcred->cmcred_ngroups, false) < 0)
+ if (check_groups("cmsgcred.cmcred_groups", cmsgcred.cmcred_groups,
+ "cmsgcred.cmcred_ngroups", cmsgcred.cmcred_ngroups, false) < 0)
return (-1);
return (0);
}
@@ -1088,56 +1088,56 @@ check_scm_creds_cmsgcred(struct cmsghdr
static int
check_scm_creds_sockcred(struct cmsghdr *cmsghdr)
{
- const struct sockcred *sockcred;
+ struct sockcred sockcred;
if (check_cmsghdr(cmsghdr, SCM_CREDS,
SOCKCREDSIZE(proc_cred.gid_num)) < 0)
return (-1);
- sockcred = (struct sockcred *)CMSG_DATA(cmsghdr);
+ bcopy(&sockcred, CMSG_DATA(cmsghdr), sizeof(sockcred));
- dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred->sc_uid);
- dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred->sc_euid);
- dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred->sc_gid);
- dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred->sc_egid);
- dbgmsg("sockcred.sc_ngroups %d", sockcred->sc_ngroups);
+ dbgmsg("sockcred.sc_uid %lu", (u_long)sockcred.sc_uid);
+ dbgmsg("sockcred.sc_euid %lu", (u_long)sockcred.sc_euid);
+ dbgmsg("sockcred.sc_gid %lu", (u_long)sockcred.sc_gid);
+ dbgmsg("sockcred.sc_egid %lu", (u_long)sockcred.sc_egid);
+ dbgmsg("sockcred.sc_ngroups %d", sockcred.sc_ngroups);
- if (sockcred->sc_uid != proc_cred.uid) {
+ if (sockcred.sc_uid != proc_cred.uid) {
logmsgx("sockcred.sc_uid %lu != %lu",
- (u_long)sockcred->sc_uid, (u_long)proc_cred.uid);
+ (u_long)sockcred.sc_uid, (u_long)proc_cred.uid);
return (-1);
}
- if (sockcred->sc_euid != proc_cred.euid) {
+ if (sockcred.sc_euid != proc_cred.euid) {
logmsgx("sockcred.sc_euid %lu != %lu",
- (u_long)sockcred->sc_euid, (u_long)proc_cred.euid);
+ (u_long)sockcred.sc_euid, (u_long)proc_cred.euid);
return (-1);
}
- if (sockcred->sc_gid != proc_cred.gid) {
+ if (sockcred.sc_gid != proc_cred.gid) {
logmsgx("sockcred.sc_gid %lu != %lu",
- (u_long)sockcred->sc_gid, (u_long)proc_cred.gid);
+ (u_long)sockcred.sc_gid, (u_long)proc_cred.gid);
return (-1);
}
- if (sockcred->sc_egid != proc_cred.egid) {
+ if (sockcred.sc_egid != proc_cred.egid) {
logmsgx("sockcred.sc_egid %lu != %lu",
- (u_long)sockcred->sc_egid, (u_long)proc_cred.egid);
+ (u_long)sockcred.sc_egid, (u_long)proc_cred.egid);
return (-1);
}
- if (sockcred->sc_ngroups == 0) {
+ if (sockcred.sc_ngroups == 0) {
logmsgx("sockcred.sc_ngroups == 0");
return (-1);
}
- if (sockcred->sc_ngroups < 0) {
+ if (sockcred.sc_ngroups < 0) {
logmsgx("sockcred.sc_ngroups %d < 0",
- sockcred->sc_ngroups);
+ sockcred.sc_ngroups);
return (-1);
}
- if (sockcred->sc_ngroups != proc_cred.gid_num) {
+ if (sockcred.sc_ngroups != proc_cred.gid_num) {
logmsgx("sockcred.sc_ngroups %d != %u",
- sockcred->sc_ngroups, proc_cred.gid_num);
+ sockcred.sc_ngroups, proc_cred.gid_num);
return (-1);
}
- if (check_groups("sockcred.sc_groups", sockcred->sc_groups,
- "sockcred.sc_ngroups", sockcred->sc_ngroups, true) < 0)
+ if (check_groups("sockcred.sc_groups", sockcred.sc_groups,
+ "sockcred.sc_ngroups", sockcred.sc_ngroups, true) < 0)
return (-1);
return (0);
}
@@ -1145,15 +1145,15 @@ check_scm_creds_sockcred(struct cmsghdr
static int
check_scm_timestamp(struct cmsghdr *cmsghdr)
{
- const struct timeval *timeval;
+ const struct timeval timeval;
if (check_cmsghdr(cmsghdr, SCM_TIMESTAMP, sizeof(struct timeval)) < 0)
return (-1);
- timeval = (struct timeval *)CMSG_DATA(cmsghdr);
+ bcopy(&timeval, CMSG_DATA(cmsghdr), sizeof(timeval));
dbgmsg("timeval.tv_sec %"PRIdMAX", timeval.tv_usec %"PRIdMAX,
- (intmax_t)timeval->tv_sec, (intmax_t)timeval->tv_usec);
+ (intmax_t)timeval.tv_sec, (intmax_t)timeval.tv_usec);
return (0);
}
@@ -1161,15 +1161,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
static int
check_scm_bintime(struct cmsghdr *cmsghdr)
{
- const struct bintime *bintime;
+ const struct bintime bintime;
if (check_cmsghdr(cmsghdr, SCM_BINTIME, sizeof(struct bintime)) < 0)
return (-1);
- bintime = (struct bintime *)CMSG_DATA(cmsghdr);
+ bcopy(&bintime, CMSG_DATA(cmsghdr), sizeof(bintime));
dbgmsg("bintime.sec %"PRIdMAX", bintime.frac %"PRIu64,
- (intmax_t)bintime->sec, bintime->frac);
+ (intmax_t)bintime.sec, bintime.frac);
return (0);
}