summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-09-04 22:13:46 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-09-04 22:13:46 +0000
commite8fa107af580dd189f6c1cfe6190c15ac85ce69f (patch)
tree2769131884bbe91228710614269c6a5f028d4501
parent07649ecd0386598396180af219bb8e00a1d9143d (diff)
make GCC 'appier and remove unused vars. Also fix retval
and a debug printout
-rw-r--r--sys/dev/atapi/acd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/atapi/acd.c b/sys/dev/atapi/acd.c
index 0e981a67d5e..f650440807f 100644
--- a/sys/dev/atapi/acd.c
+++ b/sys/dev/atapi/acd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acd.c,v 1.11 1996/09/04 00:51:13 downsj Exp $ */
+/* $OpenBSD: acd.c,v 1.12 1996/09/04 22:13:45 niklas Exp $ */
/*
* Copyright (c) 1996 Manuel Bouyer. All rights reserved.
@@ -1001,8 +1001,6 @@ acd_size(acd, flags)
{
struct atapi_read_cd_capacity_data rdcap;
struct atapi_read_cd_capacity cmd;
- u_long blksize;
- u_long size;
if (acd->ad_link->quirks & AQUIRK_NOCAPACITY) {
/*
@@ -1036,8 +1034,9 @@ acd_size(acd, flags)
acd->params.blksize = _4btol((u_int8_t*)&rdcap.blksize);
acd->params.disksize = _4btol((u_int8_t*)&rdcap.size);
- ATAPI_DEBUG_PRINT(("acd_size: %ld %ld\n",blksize,size));
- return size;
+ ATAPI_DEBUG_PRINT(("acd_size: %ld %ld\n", acd->params.blksize,
+ acd->params.disksize));
+ return acd->params.disksize;
}
/*