From owner-svn-src-all@freebsd.org Tue Jan 16 01:21:09 2018 Return-Path: Delivered-To: svn-src-all@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 35502EB522C; Tue, 16 Jan 2018 01:21:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0E5F97AAAF; Tue, 16 Jan 2018 01:21:09 +0000 (UTC) (envelope-from jhb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4211A19298; Tue, 16 Jan 2018 01:21:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0G1L8TB070628; Tue, 16 Jan 2018 01:21:08 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0G1L81G070627; Tue, 16 Jan 2018 01:21:08 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201801160121.w0G1L81G070627@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 16 Jan 2018 01:21:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328037 - head/usr.bin/truss X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/usr.bin/truss X-SVN-Commit-Revision: 328037 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jan 2018 01:21:09 -0000 Author: jhb Date: Tue Jan 16 01:21:07 2018 New Revision: 328037 URL: https://svnweb.freebsd.org/changeset/base/328037 Log: Rename 'recv' to 'receive' to appease shadow warnings from GCC. Modified: head/usr.bin/truss/syscalls.c Modified: head/usr.bin/truss/syscalls.c ============================================================================== --- head/usr.bin/truss/syscalls.c Tue Jan 16 01:05:04 2018 (r328036) +++ head/usr.bin/truss/syscalls.c Tue Jan 16 01:21:07 2018 (r328037) @@ -1308,20 +1308,20 @@ print_sctp_initmsg(FILE *fp, struct sctp_initmsg *init } static void -print_sctp_sndrcvinfo(FILE *fp, bool recv, struct sctp_sndrcvinfo *info) +print_sctp_sndrcvinfo(FILE *fp, bool receive, struct sctp_sndrcvinfo *info) { fprintf(fp, "{sid=%u,", info->sinfo_stream); - if (recv) { + if (receive) { fprintf(fp, "ssn=%u,", info->sinfo_ssn); } fputs("flgs=", fp); sysdecode_sctp_sinfo_flags(fp, info->sinfo_flags); fprintf(fp, ",ppid=%u,", ntohl(info->sinfo_ppid)); - if (!recv) { + if (!receive) { fprintf(fp, "ctx=%u,", info->sinfo_context); fprintf(fp, "ttl=%u,", info->sinfo_timetolive); } - if (recv) { + if (receive) { fprintf(fp, "tsn=%u,", info->sinfo_tsn); fprintf(fp, "cumtsn=%u,", info->sinfo_cumtsn); } @@ -1405,7 +1405,7 @@ print_sctp_ipv6_addr(FILE *fp, struct in6_addr *addr) } static void -print_sctp_cmsg(FILE *fp, bool recv, struct cmsghdr *cmsghdr) +print_sctp_cmsg(FILE *fp, bool receive, struct cmsghdr *cmsghdr) { void *data; socklen_t len; @@ -1421,7 +1421,7 @@ print_sctp_cmsg(FILE *fp, bool recv, struct cmsghdr *c break; case SCTP_SNDRCV: if (len == CMSG_LEN(sizeof(struct sctp_sndrcvinfo))) - print_sctp_sndrcvinfo(fp, recv, + print_sctp_sndrcvinfo(fp, receive, (struct sctp_sndrcvinfo *)data); else print_gen_cmsg(fp, cmsghdr); @@ -1483,7 +1483,7 @@ print_sctp_cmsg(FILE *fp, bool recv, struct cmsghdr *c } static void -print_cmsgs(FILE *fp, pid_t pid, bool recv, struct msghdr *msghdr) +print_cmsgs(FILE *fp, pid_t pid, bool receive, struct msghdr *msghdr) { struct cmsghdr *cmsghdr; char *cmsgbuf; @@ -1519,7 +1519,7 @@ print_cmsgs(FILE *fp, pid_t pid, bool recv, struct msg fputs(",data=", fp); switch (level) { case IPPROTO_SCTP: - print_sctp_cmsg(fp, recv, cmsghdr); + print_sctp_cmsg(fp, receive, cmsghdr); break; default: print_gen_cmsg(fp, cmsghdr);