diff options
| author | Bill Fumerola <billf@FreeBSD.org> | 1999-07-04 23:42:32 +0000 |
|---|---|---|
| committer | Bill Fumerola <billf@FreeBSD.org> | 1999-07-04 23:42:32 +0000 |
| commit | 9539436c36cf3d5c1286e0f732d923db57000428 (patch) | |
| tree | 7c87383daea2024c90030bb0ec41c2f34ea96ae9 /sbin/ccdconfig | |
| parent | e26b8fd66e821528da97802efcabbfefeef013aa (diff) | |
| download | src-9539436c36cf3d5c1286e0f732d923db57000428.tar.gz src-9539436c36cf3d5c1286e0f732d923db57000428.zip | |
(1) Include linker.h because we use kldload()
(2) Clear up an ambigious, nested if/else
(3) Cast a ccio_size to a long and use the correct format identifier.
Reviewed by: green
Notes
Notes:
svn path=/head/; revision=48568
Diffstat (limited to 'sbin/ccdconfig')
| -rw-r--r-- | sbin/ccdconfig/ccdconfig.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index 95ae3d19183b..95318c9d8d35 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -34,10 +34,11 @@ #ifndef lint static const char rcsid[] = - "$Id: ccdconfig.c,v 1.11 1999/04/05 06:30:12 peter Exp $"; + "$Id: ccdconfig.c,v 1.12 1999/05/06 19:20:34 phk Exp $"; #endif /* not lint */ #include <sys/param.h> +#include <sys/linker.h> #include <sys/disklabel.h> #include <sys/device.h> #include <sys/stat.h> @@ -228,7 +229,7 @@ do_single(argc, argv, action) } /* Make sure there are enough arguments. */ - if (argc < 4) + if (argc < 4) { if (argc == 3) { /* Assume that no flags are specified. */ noflags = 1; @@ -239,6 +240,7 @@ do_single(argc, argv, action) } else usage(); } + } /* First argument is the ccd to configure. */ cp = *argv++; --argc; @@ -304,7 +306,7 @@ do_single(argc, argv, action) i == 0 ? '(' : ' ', cp2, i == ccio.ccio_ndisks - 1 ? ')' : ','); } - printf(", %d blocks ", ccio.ccio_size); + printf(", %lu blocks ", (u_long)ccio.ccio_size); if (ccio.ccio_ileave != 0) printf("interleaved at %d blocks\n", ccio.ccio_ileave); else |