[src/netbsd-3]: src/sys/dev/raidframe Pull up revision 1.24 (requested by ost...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46badd0f2adc
branches:  netbsd-3
changeset: 576265:46badd0f2adc
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Jun 17 13:36:18 2005 +0000

description:
Pull up revision 1.24 (requested by oster in ticket #472):
- avoid variable shadowing
- add a lot of const
- remove parameters from function declarations

diffstat:

 sys/dev/raidframe/rf_dagfuncs.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r b321169d08eb -r 46badd0f2adc sys/dev/raidframe/rf_dagfuncs.c
--- a/sys/dev/raidframe/rf_dagfuncs.c   Fri Jun 17 13:36:11 2005 +0000
+++ b/sys/dev/raidframe/rf_dagfuncs.c   Fri Jun 17 13:36:18 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagfuncs.c,v 1.23 2005/02/27 00:27:44 perry Exp $   */
+/*     $NetBSD: rf_dagfuncs.c,v 1.23.2.1 2005/06/17 13:36:18 tron Exp $        */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.23 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.23.2.1 2005/06/17 13:36:18 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -172,7 +172,7 @@
 rf_ParityLogUpdateFunc(RF_DagNode_t *node)
 {
        RF_PhysDiskAddr_t *pda = (RF_PhysDiskAddr_t *) node->params[0].p;
-       caddr_t buf = (caddr_t) node->params[1].p;
+       caddr_t bf = (caddr_t) node->params[1].p;
        RF_ParityLogData_t *logData;
 #if RF_ACC_TRACE > 0
        RF_AccTraceEntry_t *tracerec = node->dagHdr->tracerec;
@@ -183,7 +183,7 @@
 #if RF_ACC_TRACE > 0
                RF_ETIMER_START(timer);
 #endif
-               logData = rf_CreateParityLogData(RF_UPDATE, pda, buf,
+               logData = rf_CreateParityLogData(RF_UPDATE, pda, bf,
                    (RF_Raid_t *) (node->dagHdr->raidPtr),
                    node->wakeFunc, (void *) node,
                    node->dagHdr->tracerec, timer);
@@ -209,7 +209,7 @@
 rf_ParityLogOverwriteFunc(RF_DagNode_t *node)
 {
        RF_PhysDiskAddr_t *pda = (RF_PhysDiskAddr_t *) node->params[0].p;
-       caddr_t buf = (caddr_t) node->params[1].p;
+       caddr_t bf = (caddr_t) node->params[1].p;
        RF_ParityLogData_t *logData;
 #if RF_ACC_TRACE > 0
        RF_AccTraceEntry_t *tracerec = node->dagHdr->tracerec;
@@ -220,7 +220,7 @@
 #if RF_ACC_TRACE > 0
                RF_ETIMER_START(timer);
 #endif
-               logData = rf_CreateParityLogData(RF_OVERWRITE, pda, buf,
+               logData = rf_CreateParityLogData(RF_OVERWRITE, pda, bf,
 (RF_Raid_t *) (node->dagHdr->raidPtr),
                    node->wakeFunc, (void *) node, node->dagHdr->tracerec, timer);
                if (logData)
@@ -276,7 +276,7 @@
 {
        RF_DiskQueueData_t *req;
        RF_PhysDiskAddr_t *pda = (RF_PhysDiskAddr_t *) node->params[0].p;
-       caddr_t buf = (caddr_t) node->params[1].p;
+       caddr_t bf = (caddr_t) node->params[1].p;
        RF_StripeNum_t parityStripeID = (RF_StripeNum_t) node->params[2].v;
        unsigned priority = RF_EXTRACT_PRIORITY(node->params[3].v);
        unsigned which_ru = RF_EXTRACT_RU(node->params[3].v);
@@ -288,7 +288,7 @@
                b_proc = (void *) ((struct buf *) node->dagHdr->bp)->b_proc;
 
        req = rf_CreateDiskQueueData(iotype, pda->startSector, pda->numSector,
-           buf, parityStripeID, which_ru,
+           bf, parityStripeID, which_ru,
            (int (*) (void *, int)) node->wakeFunc,
            node,
 #if RF_ACC_TRACE > 0
@@ -315,7 +315,7 @@
 {
        RF_DiskQueueData_t *req;
        RF_PhysDiskAddr_t *pda = (RF_PhysDiskAddr_t *) node->params[0].p;
-       caddr_t buf = (caddr_t) node->params[1].p;
+       caddr_t bf = (caddr_t) node->params[1].p;
        RF_StripeNum_t parityStripeID = (RF_StripeNum_t) node->params[2].v;
        unsigned priority = RF_EXTRACT_PRIORITY(node->params[3].v);
        unsigned which_ru = RF_EXTRACT_RU(node->params[3].v);
@@ -328,7 +328,7 @@
 
        /* normal processing (rollaway or forward recovery) begins here */
        req = rf_CreateDiskQueueData(iotype, pda->startSector, pda->numSector,
-           buf, parityStripeID, which_ru,
+           bf, parityStripeID, which_ru,
            (int (*) (void *, int)) node->wakeFunc,
            (void *) node,
 #if RF_ACC_TRACE > 0