Revert "Name function arguments in libc headers for Studio."
This reverts commit 079bff4fa52b0c3c76057451cc9cdecf1827fce0.
Broke builds with SANITIZE_HOST=address with an asan failure in versioner.
Change-Id: I22b113fd5405589d1a25e5e137c450aaba1ade5f
diff --git a/libc/include/err.h b/libc/include/err.h
index a64d01d..7ee3608 100644
--- a/libc/include/err.h
+++ b/libc/include/err.h
@@ -41,14 +41,18 @@
__BEGIN_DECLS
-__noreturn void err(int __status, const char* __fmt, ...) __printflike(2, 3);
-__noreturn void verr(int __status, const char* __fmt, va_list __args) __printflike(2, 0);
-__noreturn void errx(int __status, const char* __fmt, ...) __printflike(2, 3);
-__noreturn void verrx(int __status, const char* __fmt, va_list __args) __printflike(2, 0);
-void warn(const char* __fmt, ...) __printflike(1, 2);
-void vwarn(const char* __fmt, va_list __args) __printflike(1, 0);
-void warnx(const char* __fmt, ...) __printflike(1, 2);
-void vwarnx(const char* __fmt, va_list __args) __printflike(1, 0);
+/* printf's format string isn't nullable; the err family's one is,
+ * so we can't use __errlike here. */
+#define __errlike(x, y) __attribute__((__format__(printf, x, y)))
+
+__noreturn void err(int, const char *, ...) __errlike(2, 3);
+__noreturn void verr(int, const char *, va_list) __errlike(2, 0);
+__noreturn void errx(int, const char *, ...) __errlike(2, 3);
+__noreturn void verrx(int, const char *, va_list) __errlike(2, 0);
+void warn(const char *, ...) __errlike(1, 2);
+void vwarn(const char *, va_list) __errlike(1, 0);
+void warnx(const char *, ...) __errlike(1, 2);
+void vwarnx(const char *, va_list) __errlike(1, 0);
__END_DECLS