diff options
| author | Alexander von Gernler <grunk@cvs.openbsd.org> | 2008-06-14 01:47:28 +0000 |
|---|---|---|
| committer | Alexander von Gernler <grunk@cvs.openbsd.org> | 2008-06-14 01:47:28 +0000 |
| commit | 5655f80930c2fea67e04b23ae09a0d45e2dd6f2d (patch) | |
| tree | bd1de771da8a49b869c59b19104ae3fde0f0fc3c | |
| parent | 92fb6e778f9896151a5c728f0df0aa3643bdd6c2 (diff) | |
finish djm@'s job of making mount_vnd -Wall clean, and mark this in the
Makefile.
ok djm@, "get the M's out of my tree" deraadt@
| -rw-r--r-- | sbin/mount_vnd/Makefile | 4 | ||||
| -rw-r--r-- | sbin/mount_vnd/mount_vnd.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sbin/mount_vnd/Makefile b/sbin/mount_vnd/Makefile index cd70690c0bd..48a8ffccaae 100644 --- a/sbin/mount_vnd/Makefile +++ b/sbin/mount_vnd/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.5 2007/09/05 07:12:35 grunk Exp $ +# $OpenBSD: Makefile,v 1.6 2008/06/14 01:47:27 grunk Exp $ PROG= mount_vnd SRCS= mount_vnd.c pkcs5_pbkdf2.c LDADD= -lutil -lcrypto DPADD= ${LIBUTIL} +CDIAGFLAGS+= -Wall + LINKS= ${BINDIR}/mount_vnd ${BINDIR}/vnconfig MLINKS= mount_vnd.8 vnconfig.8 diff --git a/sbin/mount_vnd/mount_vnd.c b/sbin/mount_vnd/mount_vnd.c index 275f4d5ff2a..50fe6555525 100644 --- a/sbin/mount_vnd/mount_vnd.c +++ b/sbin/mount_vnd/mount_vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_vnd.c,v 1.4 2007/09/29 07:10:09 fkr Exp $ */ +/* $OpenBSD: mount_vnd.c,v 1.5 2008/06/14 01:47:27 grunk Exp $ */ /* * Copyright (c) 1993 University of Utah. * Copyright (c) 1990, 1993 @@ -279,14 +279,13 @@ config(char *dev, char *file, int action, char *key, size_t keylen) struct vnd_ioctl vndio; FILE *f; char *rdev; - int rv; + int rv = -1; if (opendev(dev, O_RDONLY, OPENDEV_PART, &rdev) < 0) err(4, "%s", rdev); f = fopen(rdev, "r"); if (f == NULL) { warn("%s", rdev); - rv = -1; goto out; } vndio.vnd_file = file; |