xnu-792.18.15.tar.gz

[apple/xnu.git] / bsd / ufs / ffs / ffs_balloc.c

diff --git a/bsd/ufs/ffs/ffs_balloc.c b/bsd/ufs/ffs/ffs_balloc.c
index 5a0cf7bcf33b6f3f35396f45281457bfa17760f8..cf998b4e5b01339c754b1ae37421f97117559b0d 100644 (file)
--- a/bsd/ufs/ffs/ffs_balloc.c
+++ b/bsd/ufs/ffs/ffs_balloc.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -81,7 +87,7 @@
 
 #if REV_ENDIAN_FS
 #include <ufs/ufs/ufs_byte_order.h>
-#include <architecture/byte_order.h>
+#include <libkern/OSByteOrder.h>
 #endif /* REV_ENDIAN_FS */
 
 /*
@@ -306,7 +312,7 @@ ffs_balloc(
                bap = (ufs_daddr_t *)buf_dataptr(bp);
 #if    REV_ENDIAN_FS
        if (rev_endian)
-               nb = NXSwapLong(bap[indirs[i].in_off]);
+               nb = OSSwapInt32(bap[indirs[i].in_off]);
        else {
 #endif /* REV_ENDIAN_FS */
                nb = bap[indirs[i].in_off];
@@ -344,7 +350,7 @@ ffs_balloc(
                }
 #if    REV_ENDIAN_FS
        if (rev_endian)
-               bap[indirs[i - 1].in_off] = NXSwapLong(nb);
+               bap[indirs[i - 1].in_off] = OSSwapInt32(nb);
        else {
 #endif /* REV_ENDIAN_FS */
                bap[indirs[i - 1].in_off] = nb;
@@ -375,7 +381,7 @@ ffs_balloc(
                *allocblk++ = nb;
 #if    REV_ENDIAN_FS
        if (rev_endian)
-               bap[indirs[i].in_off] = NXSwapLong(nb);
+               bap[indirs[i].in_off] = OSSwapInt32(nb);
        else {
 #endif /* REV_ENDIAN_FS */
                bap[indirs[i].in_off] = nb;
@@ -579,7 +585,7 @@ ffs_blkalloc(
                bap = (ufs_daddr_t *)buf_dataptr(bp);
 #if    REV_ENDIAN_FS
        if (rev_endian)
-               nb = NXSwapLong(bap[indirs[i].in_off]);
+               nb = OSSwapInt32(bap[indirs[i].in_off]);
        else {
 #endif /* REV_ENDIAN_FS */
                nb = bap[indirs[i].in_off];
@@ -617,7 +623,7 @@ ffs_blkalloc(
                }
 #if    REV_ENDIAN_FS
        if (rev_endian)
-               bap[indirs[i - 1].in_off] = NXSwapLong(nb);
+               bap[indirs[i - 1].in_off] = OSSwapInt32(nb);
        else {
 #endif /* REV_ENDIAN_FS */
                bap[indirs[i - 1].in_off] = nb;
@@ -648,7 +654,7 @@ ffs_blkalloc(
                *allocblk++ = nb;
 #if    REV_ENDIAN_FS
        if (rev_endian)
-               bap[indirs[i].in_off] = NXSwapLong(nb);
+               bap[indirs[i].in_off] = OSSwapInt32(nb);
        else {
 #endif /* REV_ENDIAN_FS */
                bap[indirs[i].in_off] = nb;