xnu-517.3.7.tar.gz

[apple/xnu.git] / bsd / kern / bsd_stubs.c

diff --git a/bsd/kern/bsd_stubs.c b/bsd/kern/bsd_stubs.c
index bfe0a85c4f80dadcf081727dcc7efa5b8aadcc20..f7c4940ca77594a4ea41a9a043e063dbb8c83cb1 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -40,7 +43,7 @@ kmem_mb_alloc(vm_map_t  mbmap, int size)
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,
                KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)
-                                return((void *)addr);
+                       return(addr);
        else
                return(0);
                
@@ -98,6 +101,9 @@ bdevsw_isfree(int index)
                            sizeof(struct bdevsw)) == 0)
                    break;
            }
+       } else {
+               /* NB: Not used below unless index is in range */
+               devsw = &bdevsw[index];
        }
 
        if ((index < 0) || (index >= nblkdev) ||
@@ -120,7 +126,7 @@ bdevsw_add(int index, struct bdevsw * bsw)
        struct bdevsw *devsw;
 
        if (index == -1) {
-           devsw = bdevsw;
+           devsw = &bdevsw[1];         /* Start at slot 1 - this is a hack to fix the index=1 hack */
            /* yes, start at 1 to avoid collision with volfs (Radar 2842228) */
            for(index=1; index < nblkdev; index++, devsw++) {
                if(memcmp((char *)devsw,