summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>2001-02-19 22:22:16 +0000
committercgd <cgd@NetBSD.org>2001-02-19 22:22:16 +0000
commit6b25d775138e13c8d80d355923af2cf3729ef131 (patch)
treef14c2e95abc3d458e4ccc16dab2986e88d32cfdd /lib/libc/stdlib/malloc.c
parent337d03ef634b26202bbca614a6834ea6505ae0d2 (diff)
convert from __progname to getprogname()
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index bb2c285e3f8..38c876975a3 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: malloc.c,v 1.35 2001/01/05 22:29:28 jdolecek Exp $ */
+/* $NetBSD: malloc.c,v 1.36 2001/02/19 22:22:17 cgd Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -272,13 +272,12 @@ static void *imalloc(size_t size);
static void ifree(void *ptr);
static void *irealloc(void *ptr, size_t size);
-extern char *__progname;
-
static void
wrterror(char *p)
{
+ const char *progname = getprogname();
char *q = " error: ";
- write(STDERR_FILENO, __progname, strlen(__progname));
+ write(STDERR_FILENO, progname, strlen(progname));
write(STDERR_FILENO, malloc_func, strlen(malloc_func));
write(STDERR_FILENO, q, strlen(q));
write(STDERR_FILENO, p, strlen(p));
@@ -289,10 +288,11 @@ wrterror(char *p)
static void
wrtwarning(char *p)
{
+ const char *progname = getprogname();
char *q = " warning: ";
if (malloc_abort)
wrterror(p);
- write(STDERR_FILENO, __progname, strlen(__progname));
+ write(STDERR_FILENO, progname, strlen(progname));
write(STDERR_FILENO, malloc_func, strlen(malloc_func));
write(STDERR_FILENO, q, strlen(q));
write(STDERR_FILENO, p, strlen(p));