From owner-svn-src-head@FreeBSD.ORG Fri Dec 26 22:55:39 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52B4D106564A; Fri, 26 Dec 2008 22:55:39 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 41FF48FC1F; Fri, 26 Dec 2008 22:55:39 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBQMtdWl052752; Fri, 26 Dec 2008 22:55:39 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBQMtdXv052750; Fri, 26 Dec 2008 22:55:39 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <200812262255.mBQMtdXv052750@svn.freebsd.org> From: "David E. O'Brien" Date: Fri, 26 Dec 2008 22:55:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186505 - head/sbin/mount X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Dec 2008 22:55:39 -0000 Author: obrien Date: Fri Dec 26 22:55:38 2008 New Revision: 186505 URL: http://svn.freebsd.org/changeset/base/186505 Log: style(9) Modified: head/sbin/mount/getmntopts.c head/sbin/mount/mount.c Modified: head/sbin/mount/getmntopts.c ============================================================================== --- head/sbin/mount/getmntopts.c Fri Dec 26 22:54:53 2008 (r186504) +++ head/sbin/mount/getmntopts.c Fri Dec 26 22:55:38 2008 (r186505) @@ -130,7 +130,7 @@ checkpath(const char *path, char *resolv struct stat sb; if (realpath(path, resolved) != NULL && stat(resolved, &sb) == 0) { - if (!S_ISDIR(sb.st_mode)) + if (!S_ISDIR(sb.st_mode)) errx(EX_USAGE, "%s: not a directory", resolved); } else errx(EX_USAGE, "%s: %s", resolved, strerror(errno)); @@ -176,7 +176,7 @@ build_iovec_argf(struct iovec **iov, int char val[255] = { 0 }; va_start(ap, fmt); - vsnprintf(val, sizeof(val), fmt, ap); + vsnprintf(val, sizeof(val), fmt, ap); va_end(ap); build_iovec(iov, iovlen, name, strdup(val), (size_t)-1); } Modified: head/sbin/mount/mount.c ============================================================================== --- head/sbin/mount/mount.c Fri Dec 26 22:54:53 2008 (r186504) +++ head/sbin/mount/mount.c Fri Dec 26 22:55:38 2008 (r186505) @@ -145,7 +145,7 @@ use_mountprog(const char *vfstype) if (strcmp(vfstype, fs[i]) == 0) return (1); } - + return (0); } @@ -210,7 +210,7 @@ static void restart_mountd(void) { struct pidfh *pfh; - pid_t mountdpid; + pid_t mountdpid; pfh = pidfile_open(_PATH_MOUNTDPID, 0600, &mountdpid); if (pfh != NULL) { @@ -302,7 +302,7 @@ main(int argc, char *argv[]) if ((init_flags & MNT_UPDATE) && (ro == 0)) options = catopt(options, "noro"); - + rval = 0; switch (argc) { case 0: @@ -567,7 +567,7 @@ mountfs(const char *vfstype, const char if (use_mountprog(vfstype)) { ret = exec_mountprog(name, execname, argv); } else { - ret = mount_fs(vfstype, argc, argv); + ret = mount_fs(vfstype, argc, argv); } free(optbuf);