xnu-6153.81.5.tar.gz

[apple/xnu.git] / libsyscall / mach / mach_error.c

diff --git a/libsyscall/mach/mach_error.c b/libsyscall/mach/mach_error.c
index b87c0adbf2dae068a6405a3c9afcd83fadfc2626..03efb272e74601eab931e954c22133e8bb2f493e 100644 (file)
--- a/libsyscall/mach/mach_error.c
+++ b/libsyscall/mach/mach_error.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2010 Apple 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
@@ -11,10 +11,10 @@
  * 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,
@@ -22,37 +22,37 @@
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 
 /*
- *     File:   mach_error.c
+ *      File:  mach_error.c
  *     Author: Douglas Orr, Carnegie Mellon University
  *     Date:   Mar 1988
  *
@@ -60,26 +60,24 @@
  *      or returns a descriptive string.
  */
 
-#include <stdio.h>
 #include <mach/mach_error.h>
 #include <mach/boolean.h>
 #include "errorlib.h"
+#include "string.h"
 
 int fprintf_stderr(const char *format, ...);
 
 void
-mach_error( str, err )
-       const char *str; 
-       mach_error_t err;
+mach_error(const char *str, mach_error_t err)
 {
-       char * err_str;
+       char *err_str;
        char buf[1024];
        boolean_t diag;
 
-       err_str=mach_error_string_int(err, &diag);
+       err_str = mach_error_string_int(err, &diag);
 
-       if ( diag ) {
-               sprintf( buf, "%s %s (%x)", mach_error_type(err), err_str, err );
+       if (diag) {
+               _mach_snprintf(buf, sizeof(buf), "%s %s (%x)", mach_error_type(err), err_str, err);
                err_str = buf;
        }