diff options
author | phk <phk@FreeBSD.org> | 2002-12-17 19:16:10 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-12-17 19:16:10 +0000 |
commit | 756126a3b5a429face16de8d5fc826e974a391d2 (patch) | |
tree | f6b14fb53be7ae777755e6a83d265d8fc3e48660 /sbin/gbde | |
parent | 7e42ab358e51ddbfce4e5182a6039af428d97b9d (diff) | |
download | FreeBSD-src-756126a3b5a429face16de8d5fc826e974a391d2.zip FreeBSD-src-756126a3b5a429face16de8d5fc826e974a391d2.tar.gz |
A couple of stylistic improvements.
Diffstat (limited to 'sbin/gbde')
-rw-r--r-- | sbin/gbde/Makefile | 2 | ||||
-rw-r--r-- | sbin/gbde/gbde.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sbin/gbde/Makefile b/sbin/gbde/Makefile index 906f196..58a992e 100644 --- a/sbin/gbde/Makefile +++ b/sbin/gbde/Makefile @@ -8,6 +8,8 @@ SRCS+= rijndael-api-fst.c SRCS+= sha2.c SRCS+= g_bde_lock.c +WARNS?= 5 + CFLAGS+= -I${.CURDIR}/../../sys .PATH: ${.CURDIR}/../../sys/geom \ ${.CURDIR}/../../sys/geom/bde \ diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c index 5fd50c1..415d1c1 100644 --- a/sbin/gbde/gbde.c +++ b/sbin/gbde/gbde.c @@ -231,7 +231,7 @@ cmd_attach(const struct g_bde_softc *sc, const char *dest, const char *lfile) gcg.class.len = strlen(gcg.class.u.name); gcg.provider.u.name = dest; gcg.provider.len = strlen(gcg.provider.u.name); - gcg.flag = 0; + gcg.flag = GCFG_CREATE; gcg.len = sizeof buf; gcg.ptr = buf; @@ -266,7 +266,7 @@ cmd_detach(const char *dest) gcg.class.len = strlen(gcg.class.u.name); gcg.provider.u.name = dest; gcg.provider.len = strlen(gcg.provider.u.name); - gcg.flag = 1; + gcg.flag = GCFG_DISMANTLE; i = ioctl(gfd, GEOMCONFIGGEOM, &gcg); if (i != 0) @@ -721,8 +721,7 @@ main(int argc, char **argv) if (!*optarg || *q) usage("-n argument not numeric\n"); if (n_opt < -1 || n_opt > G_BDE_MAXKEYS) - usage("-n argument out of range\n"); - break; + usage("-n argument out of range\n"); break; default: usage("Invalid option\n"); } @@ -743,7 +742,7 @@ main(int argc, char **argv) } memset(&sc, 0, sizeof sc); - sc.consumer = (struct g_consumer *)&dfd; + sc.consumer = (void *)&dfd; gl = &sc.key; switch(action) { case ACT_ATTACH: |