From 082e680bd54e999f2bb4eb77141958938b1e9ee9 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Wed, 11 Feb 2004 23:48:50 +0000
Subject: New stdio core. Should be more maintainable. Fixes a couple of
bugs. Codepaths streamlined. Improved performance for nonthreaded apps
when linked with a thread-enabled libc. Minor iconv bug and some
locale/thread related startup issues fixed. These showed up in getting a
gcj-compiled java helloworld app running. Removed some old extension
functions... _stdio_fdout and _stdio_fsfopen.
---
libc/misc/assert/__assert.c | 33 ++-------------------------------
1 file changed, 2 insertions(+), 31 deletions(-)
(limited to 'libc/misc/assert')
diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index 74b5ee86f..2949b75f0 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -27,10 +27,11 @@
* and is useful in debugging the stdio code.
*/
-#define _STDIO_UTILITY /* For _stdio_fdout and _int10tostr. */
+#define _ISOC99_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <bits/uClibc_uintmaxtostr.h>
/* Get the prototype from assert.h as a double-check. */
#undef NDEBUG
@@ -44,8 +45,6 @@
extern const char *__progname;
#endif
-#if 1
-
static int in_assert; /* bss inits to 0. */
void __assert(const char *assertion, const char * filename,
@@ -69,31 +68,3 @@ void __assert(const char *assertion, const char * filename,
}
abort();
}
-
-#else
-
-void __assert(const char *assertion, const char * filename,
- int linenumber, register const char * function)
-{
- char buf[__BUFLEN_INT10TOSTR];
-
- _stdio_fdout(STDERR_FILENO,
-#ifdef ASSERT_SHOW_PROGNAME
- __progname,
- ": ",
-#endif
- filename,
- ":",
- _int10tostr(buf+sizeof(buf)-1, linenumber),
- ": ",
- /* Function name isn't available with some compilers. */
- ((function == NULL) ? "?function?" : function),
- ": Assertion `",
- assertion,
- "' failed.\n",
- NULL
- );
- abort();
-}
-
-#endif
--
cgit v1.2.3