diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-07 02:32:27 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-01-07 02:32:27 +0000 |
| commit | e523bd15353350c3480b8a1820a0944b0fa8212e (patch) | |
| tree | 60485116f9c62c306bb753f12f9d4eb79d16aa4e /libc/misc/error/err.c | |
| parent | 3b3434516a3415d7e0f4e1d50c553876dcb337b2 (diff) | |
| download | uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.bz2 uClibc-alpine-e523bd15353350c3480b8a1820a0944b0fa8212e.tar.xz | |
Big fricking merge from trunk.
Diffstat (limited to 'libc/misc/error/err.c')
| -rw-r--r-- | libc/misc/error/err.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c index 922cd8aba..43fe60cc6 100644 --- a/libc/misc/error/err.c +++ b/libc/misc/error/err.c @@ -19,10 +19,8 @@ #endif #ifdef __UCLIBC_MJN3_ONLY__ -#warning REMINDER: Need a centralized __progname prototype. #warning REMINDER: Deal with wide oriented stderr case. #endif -extern const char *__progname; static void vwarn_work(const char *format, va_list args, int showerr) { @@ -41,7 +39,7 @@ static void vwarn_work(const char *format, va_list args, int showerr) __STDIO_AUTO_THREADLOCK(stderr); - fprintf(stderr, fmt, __progname); + fprintf(stderr, fmt, __uclibc_progname); if (format) { vfprintf(stderr, format, args); f -= 2; /* At 5 (showerr) or 9. */ @@ -84,7 +82,7 @@ void warnx(const char *format, ...) void attribute_hidden __verr(int status, const char *format, va_list args) { __vwarn(format, args); - exit(status); + __exit(status); } strong_alias(__verr,verr) @@ -103,7 +101,7 @@ void attribute_noreturn err(int status, const char *format, ...) void attribute_hidden __verrx(int status, const char *format, va_list args) { __vwarnx(format, args); - exit(status); + __exit(status); } strong_alias(__verrx,verrx) |