xnu-2422.115.4.tar.gz

[apple/xnu.git] / bsd / hfs / MacOSStubs.c

diff --git a/bsd/hfs/MacOSStubs.c b/bsd/hfs/MacOSStubs.c
index 0f34e7a8356f3e8e74d51fea765f968641791e0c..0a1bded31d80f6f891f332326d5c9a135b5719c9 100644 (file)
--- a/bsd/hfs/MacOSStubs.c
+++ b/bsd/hfs/MacOSStubs.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * 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 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -33,11 +31,12 @@
 #include <sys/malloc.h>
 #include <sys/types.h>
 
+#include <pexpert/pexpert.h>
+
 #include "hfs.h"
 #include "hfs_dbg.h"
 #include "hfscommon/headers/FileMgrInternal.h"
 
-
 /* 
  * gTimeZone should only be used for HFS volumes!
  * It is initialized when an HFS volume is mounted.
@@ -49,7 +48,7 @@ struct timezone gTimeZone = {8*60,1};
  *
  * called by the Catalog Manager when creating/updating HFS Plus records
  */
-UInt32 GetTimeUTC(void)
+u_int32_t GetTimeUTC(void)
 {
        struct timeval tv;
 
@@ -63,9 +62,9 @@ UInt32 GetTimeUTC(void)
  * LocalToUTC - convert from Mac OS local time to Mac OS GMT time.
  * This should only be called for HFS volumes (not for HFS Plus).
  */
-UInt32 LocalToUTC(UInt32 localTime)
+u_int32_t LocalToUTC(u_int32_t localTime)
 {
-       UInt32 gtime = localTime;
+       u_int32_t gtime = localTime;
        
        if (gtime != 0) {
                gtime += (gTimeZone.tz_minuteswest * 60);
@@ -84,9 +83,9 @@ UInt32 LocalToUTC(UInt32 localTime)
  * UTCToLocal - convert from Mac OS GMT time to Mac OS local time.
  * This should only be called for HFS volumes (not for HFS Plus).
  */
-UInt32 UTCToLocal(UInt32 utcTime)
+u_int32_t UTCToLocal(u_int32_t utcTime)
 {
-       UInt32 ltime = utcTime;
+       u_int32_t ltime = utcTime;
        
        if (ltime != 0) {
                ltime -= (gTimeZone.tz_minuteswest * 60);
@@ -158,9 +157,12 @@ void DisposePtr (Ptr p)
 }
 
 
-void DebugStr (ConstStr255Param  debuggerMsg)
+void
+DebugStr(
+       const char * debuggerMsg
+       )
 {
-    kprintf ("*** Mac OS Debugging Message: %s\n", &debuggerMsg[1]);
+    kprintf ("*** Mac OS Debugging Message: %s\n", debuggerMsg);
        DEBUG_BREAK;
 }