Libc-1158.1.2.tar.gz

[apple/libc.git] / include / err.h

diff --git a/include/err.h b/include/err.h
index 9195051dbb46e9d85417064b0be8faafa424d25a..6a531763b24d81c8afdb3df0d640aafe5fbbcb0d 100644 (file)
--- a/include/err.h
+++ b/include/err.h
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2003, 2004, 2008 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * 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
  * 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


@@ -65,26 +63,30 @@
  * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
  * of them here we may collide with the utility's includes.  It's unreasonable
  * for utilities to have to include one of them to include err.h, so we get
  * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
  * of them here we may collide with the utility's includes.  It's unreasonable
  * for utilities to have to include one of them to include err.h, so we get

- * _BSD_VA_LIST_ from <machine/ansi.h> and use it.
+ * __darwin_va_list from <machine/_type.h> and use it.

  */
  */

-#include <machine/ansi.h>

 #include <sys/cdefs.h>
 #include <sys/cdefs.h>

+#include <_types.h>
+#include <Availability.h>

 
 __BEGIN_DECLS
 
 __BEGIN_DECLS

-void   err(int, const char *, ...) __dead2;
-void   verr(int, const char *, _BSD_VA_LIST_) __dead2;
-void   errc(int, int, const char *, ...) __dead2;
-void   verrc(int, int, const char *, _BSD_VA_LIST_) __dead2;
-void   errx(int, const char *, ...) __dead2;
-void   verrx(int, const char *, _BSD_VA_LIST_) __dead2;
-void   warn(const char *, ...);
-void   vwarn(const char *, _BSD_VA_LIST_);
-void   warnc(int, const char *, ...);
-void   vwarnc(int, const char *, _BSD_VA_LIST_);
-void   warnx(const char *, ...);
-void   vwarnx(const char *, _BSD_VA_LIST_);
+void   err(int, const char *, ...) __dead2 __printflike(2, 3);
+void   verr(int, const char *, __darwin_va_list) __dead2 __printflike(2, 0);
+void   errc(int, int, const char *, ...) __dead2 __printflike(3, 4);
+void   verrc(int, int, const char *, __darwin_va_list) __dead2 __printflike(3, 0);
+void   errx(int, const char *, ...) __dead2 __printflike(2, 3);
+void   verrx(int, const char *, __darwin_va_list) __dead2 __printflike(2, 0);
+void   warn(const char *, ...) __printflike(1, 2);
+void   vwarn(const char *, __darwin_va_list) __printflike(1, 0);
+void   warnc(int, const char *, ...) __printflike(2, 3);
+void   vwarnc(int, const char *, __darwin_va_list) __printflike(2, 0);
+void   warnx(const char *, ...) __printflike(1, 2);
+void   vwarnx(const char *, __darwin_va_list) __printflike(1, 0);

 void   err_set_file(void *);
 void   err_set_file(void *);

-void   err_set_exit(void (*)(int));
+void   err_set_exit(void (* _Nullable)(int));
+#ifdef __BLOCKS__
+void   err_set_exit_b(void (^ _Nullable)(int)) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+#endif /* __BLOCKS__ */

 
 __END_DECLS
 
 
 __END_DECLS