xnu-1699.32.7.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_dbg.h

diff --git a/bsd/hfs/hfs_dbg.h b/bsd/hfs/hfs_dbg.h
index 101f17baa806da71ad07788762279d0a3a82d63b..f39271fe42e77a3314b9fc733144aefa0b4398a2 100644 (file)
--- a/bsd/hfs/hfs_dbg.h
+++ b/bsd/hfs/hfs_dbg.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*     hfs_dbg.h
  *
@@ -36,6 +39,7 @@
  */
 
 struct componentname;
+extern void Debugger(const char *message);
 
 /* Define the debugging stage...
                4 -> Do all, aggresive, call_kdp
@@ -90,7 +94,7 @@ extern int hfs_dbg_err;
     #if (HFS_DEBUG_STAGE == 4)
                char            gDebugAssertStr[255];
                #define DBG_ASSERT(a) { if (!(a)) { \
-                               sprintf(gDebugAssertStr,"Oops - File "__FILE__", line %d: assertion '%s' failed.\n", __LINE__, #a); \
+                               snprintf(gDebugAssertStr, sizeof (gDebugAssertStr), "Oops - File "__FILE__", line %d: assertion '%s' failed.\n", __LINE__, #a); \
                 Debugger(gDebugAssertStr); } }
        #else
 #define DBG_ASSERT(a) { if (!(a)) { panic("File "__FILE__", line %d: assertion '%s' failed.\n", __LINE__, #a); } }
@@ -101,7 +105,7 @@ extern int hfs_dbg_err;
 
 #define DBG_ERR(x)     {               \
        if(hfs_dbg_all || hfs_dbg_err) {        \
-        PRINTIT("%X: ", current_proc()->p_pid); \
+        PRINTIT("%X: ", proc_selfpid()); \
            PRINTIT("HFS ERROR: "); \
            PRINTIT x;                  \
            PRINT_DELAY;  \