From owner-svn-src-user@freebsd.org  Fri Jan 22 07:35:11 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 CAC50A8B886
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri, 22 Jan 2016 07:35:11 +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 898B815DA;
 Fri, 22 Jan 2016 07:35:11 +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 u0M7ZAwD068261;
 Fri, 22 Jan 2016 07:35:10 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0M7ZAx5068260;
 Fri, 22 Jan 2016 07:35:10 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601220735.u0M7ZAx5068260@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: Fri, 22 Jan 2016 07:35:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r294555 -
 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 &quot; user&quot;
 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: Fri, 22 Jan 2016 07:35:11 -0000

Author: ngie
Date: Fri Jan 22 07:35:10 2016
New Revision: 294555
URL: https://svnweb.freebsd.org/changeset/base/294555

Log:
  Use less terse names for bintime (bt), cmesgcred (cmcred),
  sockcred (sc), and timeval (tv)
  
  Requested by: bde

Modified:
  user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c

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	Fri Jan 22 07:32:39 2016	(r294554)
+++ user/ngie/socket-tests/tools/regression/sockets/unix_cmsg/unix_cmsg.c	Fri Jan 22 07:35:10 2016	(r294555)
@@ -1031,63 +1031,63 @@ check_xucred(const struct xucred *xucred
 static int
 check_scm_creds_cmsgcred(struct cmsghdr *cmsghdr)
 {
-	const struct cmsgcred *cmsgcred;
+	const struct cmsgcred *cmcred;
 	int rc;
 
-	if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(*cmsgcred)) < 0)
+	if (check_cmsghdr(cmsghdr, SCM_CREDS, sizeof(struct cmsgcred)) < 0)
 		return (-1);
 
-	cmsgcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
+	cmcred = (struct cmsgcred *)CMSG_DATA(cmsghdr);
 
-	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)cmcred->cmcred_pid);
+	dbgmsg("cmsgcred.cmcred_uid %lu", (u_long)cmcred->cmcred_uid);
+	dbgmsg("cmsgcred.cmcred_euid %lu", (u_long)cmcred->cmcred_euid);
+	dbgmsg("cmsgcred.cmcred_gid %lu", (u_long)cmcred->cmcred_gid);
+	dbgmsg("cmsgcred.cmcred_ngroups %d", cmcred->cmcred_ngroups);
 
 	rc = 0;
 
-	if (cmsgcred->cmcred_pid != client_pid) {
+	if (cmcred->cmcred_pid != client_pid) {
 		logmsgx("cmsgcred.cmcred_pid %ld != %ld",
-		    (long)cmsgcred->cmcred_pid, (long)client_pid);
+		    (long)cmcred->cmcred_pid, (long)client_pid);
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_uid != proc_cred.uid) {
+	if (cmcred->cmcred_uid != proc_cred.uid) {
 		logmsgx("cmsgcred.cmcred_uid %lu != %lu",
-		    (u_long)cmsgcred->cmcred_uid, (u_long)proc_cred.uid);
+		    (u_long)cmcred->cmcred_uid, (u_long)proc_cred.uid);
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_euid != proc_cred.euid) {
+	if (cmcred->cmcred_euid != proc_cred.euid) {
 		logmsgx("cmsgcred.cmcred_euid %lu != %lu",
-		    (u_long)cmsgcred->cmcred_euid, (u_long)proc_cred.euid);
+		    (u_long)cmcred->cmcred_euid, (u_long)proc_cred.euid);
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_gid != proc_cred.gid) {
+	if (cmcred->cmcred_gid != proc_cred.gid) {
 		logmsgx("cmsgcred.cmcred_gid %lu != %lu",
-		    (u_long)cmsgcred->cmcred_gid, (u_long)proc_cred.gid);
+		    (u_long)cmcred->cmcred_gid, (u_long)proc_cred.gid);
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_ngroups == 0) {
+	if (cmcred->cmcred_ngroups == 0) {
 		logmsgx("cmsgcred.cmcred_ngroups == 0");
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_ngroups < 0) {
+	if (cmcred->cmcred_ngroups < 0) {
 		logmsgx("cmsgcred.cmcred_ngroups %d < 0",
-		    cmsgcred->cmcred_ngroups);
+		    cmcred->cmcred_ngroups);
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_ngroups > CMGROUP_MAX) {
+	if (cmcred->cmcred_ngroups > CMGROUP_MAX) {
 		logmsgx("cmsgcred.cmcred_ngroups %d > %d",
-		    cmsgcred->cmcred_ngroups, CMGROUP_MAX);
+		    cmcred->cmcred_ngroups, CMGROUP_MAX);
 		rc = -1;
 	}
-	if (cmsgcred->cmcred_groups[0] != proc_cred.egid) {
+	if (cmcred->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)cmcred->cmcred_groups[0], (u_long)proc_cred.egid);
 		rc = -1;
 	}
-	if (check_groups("cmsgcred.cmcred_groups", cmsgcred->cmcred_groups,
-	    "cmsgcred.cmcred_ngroups", cmsgcred->cmcred_ngroups, false) < 0)
+	if (check_groups("cmsgcred.cmcred_groups", cmcred->cmcred_groups,
+	    "cmsgcred.cmcred_ngroups", cmcred->cmcred_ngroups, false) < 0)
 		rc = -1;
 	return (rc);
 }
@@ -1095,59 +1095,59 @@ check_scm_creds_cmsgcred(struct cmsghdr 
 static int
 check_scm_creds_sockcred(struct cmsghdr *cmsghdr)
 {
-	const struct sockcred *sockcred;
+	const struct sockcred *sc;
 	int rc;
 
 	if (check_cmsghdr(cmsghdr, SCM_CREDS,
 	    SOCKCREDSIZE(proc_cred.gid_num)) < 0)
 		return (-1);
 
-	sockcred = (struct sockcred *)CMSG_DATA(cmsghdr);
+	sc = (struct sockcred *)CMSG_DATA(cmsghdr);
 
 	rc = 0;
 
-	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)sc->sc_uid);
+	dbgmsg("sockcred.sc_euid %lu", (u_long)sc->sc_euid);
+	dbgmsg("sockcred.sc_gid %lu", (u_long)sc->sc_gid);
+	dbgmsg("sockcred.sc_egid %lu", (u_long)sc->sc_egid);
+	dbgmsg("sockcred.sc_ngroups %d", sc->sc_ngroups);
 
-	if (sockcred->sc_uid != proc_cred.uid) {
+	if (sc->sc_uid != proc_cred.uid) {
 		logmsgx("sockcred.sc_uid %lu != %lu",
-		    (u_long)sockcred->sc_uid, (u_long)proc_cred.uid);
+		    (u_long)sc->sc_uid, (u_long)proc_cred.uid);
 		rc = -1;
 	}
-	if (sockcred->sc_euid != proc_cred.euid) {
+	if (sc->sc_euid != proc_cred.euid) {
 		logmsgx("sockcred.sc_euid %lu != %lu",
-		    (u_long)sockcred->sc_euid, (u_long)proc_cred.euid);
+		    (u_long)sc->sc_euid, (u_long)proc_cred.euid);
 		rc = -1;
 	}
-	if (sockcred->sc_gid != proc_cred.gid) {
+	if (sc->sc_gid != proc_cred.gid) {
 		logmsgx("sockcred.sc_gid %lu != %lu",
-		    (u_long)sockcred->sc_gid, (u_long)proc_cred.gid);
+		    (u_long)sc->sc_gid, (u_long)proc_cred.gid);
 		rc = -1;
 	}
-	if (sockcred->sc_egid != proc_cred.egid) {
+	if (sc->sc_egid != proc_cred.egid) {
 		logmsgx("sockcred.sc_egid %lu != %lu",
-		    (u_long)sockcred->sc_egid, (u_long)proc_cred.egid);
+		    (u_long)sc->sc_egid, (u_long)proc_cred.egid);
 		rc = -1;
 	}
-	if (sockcred->sc_ngroups == 0) {
+	if (sc->sc_ngroups == 0) {
 		logmsgx("sockcred.sc_ngroups == 0");
 		rc = -1;
 	}
-	if (sockcred->sc_ngroups < 0) {
+	if (sc->sc_ngroups < 0) {
 		logmsgx("sockcred.sc_ngroups %d < 0",
-		    sockcred->sc_ngroups);
+		    sc->sc_ngroups);
 		rc = -1;
 	}
-	if (sockcred->sc_ngroups != proc_cred.gid_num) {
+	if (sc->sc_ngroups != proc_cred.gid_num) {
 		logmsgx("sockcred.sc_ngroups %d != %u",
-		    sockcred->sc_ngroups, proc_cred.gid_num);
+		    sc->sc_ngroups, proc_cred.gid_num);
 		rc = -1;
 	}
-	if (check_groups("sockcred.sc_groups", sockcred->sc_groups,
-	    "sockcred.sc_ngroups", sockcred->sc_ngroups, true) < 0)
+	if (check_groups("sockcred.sc_groups", sc->sc_groups,
+	    "sockcred.sc_ngroups", sc->sc_ngroups, true) < 0)
 		rc = -1;
 	return (rc);
 }
@@ -1155,15 +1155,15 @@ check_scm_creds_sockcred(struct cmsghdr 
 static int
 check_scm_timestamp(struct cmsghdr *cmsghdr)
 {
-	const struct timeval *timeval;
+	const struct timeval *tv;
 
 	if (check_cmsghdr(cmsghdr, SCM_TIMESTAMP, sizeof(struct timeval)) < 0)
 		return (-1);
 
-	timeval = (struct timeval *)CMSG_DATA(cmsghdr);
+	tv = (struct timeval *)CMSG_DATA(cmsghdr);
 
 	dbgmsg("timeval.tv_sec %"PRIdMAX", timeval.tv_usec %"PRIdMAX,
-	    (intmax_t)timeval->tv_sec, (intmax_t)timeval->tv_usec);
+	    (intmax_t)tv->tv_sec, (intmax_t)tv->tv_usec);
 
 	return (0);
 }
@@ -1171,15 +1171,15 @@ check_scm_timestamp(struct cmsghdr *cmsg
 static int
 check_scm_bintime(struct cmsghdr *cmsghdr)
 {
-	const struct bintime *bintime;
+	const struct bintime *bt;
 
 	if (check_cmsghdr(cmsghdr, SCM_BINTIME, sizeof(struct bintime)) < 0)
 		return (-1);
 
-	bintime = (struct bintime *)CMSG_DATA(cmsghdr);
+	bt = (struct bintime *)CMSG_DATA(cmsghdr);
 
 	dbgmsg("bintime.sec %"PRIdMAX", bintime.frac %"PRIu64,
-	    (intmax_t)bintime->sec, bintime->frac);
+	    (intmax_t)bt->sec, bt->frac);
 
 	return (0);
 }