svn commit: trunk/uClibc/libc/misc/error

psm at uclibc.org psm at uclibc.org
Thu Dec 8 14:41:19 UTC 2005


Author: psm
Date: 2005-12-08 06:40:58 -0800 (Thu, 08 Dec 2005)
New Revision: 12742

Log:
Reorder so that no prototype is needed. Is there a better way to get rid of gcc warning instead of adding the loop for err/errx? attribute_noreturn is not enough ;-(

Modified:
   trunk/uClibc/libc/misc/error/err.c


Changeset:
Modified: trunk/uClibc/libc/misc/error/err.c
===================================================================
--- trunk/uClibc/libc/misc/error/err.c	2005-12-08 14:36:57 UTC (rev 12741)
+++ trunk/uClibc/libc/misc/error/err.c	2005-12-08 14:40:58 UTC (rev 12742)
@@ -49,62 +49,70 @@
 	__STDIO_AUTO_THREADUNLOCK(stderr);
 }
 
-extern void warn(const char *format, ...)
+void attribute_hidden __vwarn(const char *format, va_list args)
 {
+	vwarn_work(format, args, 1);
+}
+strong_alias(__vwarn,vwarn)
+
+void warn(const char *format, ...)
+{
 	va_list args;
 
 	va_start(args, format);
-	vwarn(format, args);
+	__vwarn(format, args);
 	va_end(args);
 }
 
-extern void vwarn(const char *format, va_list args)
+void attribute_hidden __vwarnx(const char *format, va_list args)
 {
-	vwarn_work(format, args, 1);
+	vwarn_work(format, args, 0);
 }
+strong_alias(__vwarnx,vwarnx)
 
-extern void warnx(const char *format, ...)
+void warnx(const char *format, ...)
 {
 	va_list args;
 
 	va_start(args, format);
-	vwarnx(format, args);
+	__vwarnx(format, args);
 	va_end(args);
 }
 
-extern void vwarnx(const char *format, va_list args)
+void attribute_hidden __verr(int status, const char *format, va_list args)
 {
-	vwarn_work(format, args, 0);
+	__vwarn(format, args);
+	exit(status);
 }
+strong_alias(__verr,verr)
 
-extern void err(int status, const char *format, ...)
+void attribute_noreturn err(int status, const char *format, ...)
 {
 	va_list args;
 
 	va_start(args, format);
-	verr(status, format, args);
+	__verr(status, format, args);
 	/* This should get optimized away.  We'll leave it now for safety. */
-	va_end(args);
+	/* The loop is added only to keep gcc happy. */
+	while(1)
+		va_end(args);
 }
 
-extern void verr(int status, const char *format, va_list args)
+void attribute_hidden __verrx(int status, const char *format, va_list args)
 {
-	vwarn(format, args);
+	__vwarnx(format, args);
 	exit(status);
 }
+strong_alias(__verrx,verrx)
 
-extern void errx(int status, const char *format, ...)
+void attribute_noreturn errx(int status, const char *format, ...)
 {
 	va_list args;
 
 	va_start(args, format);
-	verrx(status, format, args);
+	__verrx(status, format, args);
 	/* This should get optimized away.  We'll leave it now for safety. */
-	va_end(args);
+	/* The loop is added only to keep gcc happy. */
+	while(1)
+		va_end(args);
 }
-
-extern void verrx(int status, const char *format, va_list args)
-{
-	vwarnx(format, args);
-	exit(status);
-}




More information about the uClibc-cvs mailing list