diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index 0c0e0fed807a..194b3df56846 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -130,7 +130,7 @@ checkpath(const char *path, char *resolved) 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 *iovlen, const char *name, 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); } diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 950ac5871096..1cc15a7ce8b8 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -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 *spec, const char *name, int flags, 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);