summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-04-24 16:49:36 +0000
committerphk <phk@FreeBSD.org>2002-04-24 16:49:36 +0000
commit06842004edacee7beec6cb72239ded59709506a2 (patch)
tree05364aa5ca56a331f5dfa5fbf936e6eedcd8848a
parent0d501042d0b01cfa914b0e810146322fd0af0af1 (diff)
downloadFreeBSD-src-06842004edacee7beec6cb72239ded59709506a2.zip
FreeBSD-src-06842004edacee7beec6cb72239ded59709506a2.tar.gz
Constify _malloc_options.
-rw-r--r--include/stdlib.h2
-rw-r--r--lib/libc/stdlib/malloc.34
-rw-r--r--lib/libc/stdlib/malloc.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/stdlib.h b/include/stdlib.h
index a76f8ed..086cddd 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -124,7 +124,7 @@ int mbtowc(wchar_t *, const char *, size_t);
size_t wcstombs(char *, const wchar_t *, size_t);
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-extern char *_malloc_options;
+extern const char *_malloc_options;
extern void (*_malloc_message)(char *p1, char *p2, char *p3, char *p4);
int putenv(const char *);
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 4271ff8..a78d830 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -56,8 +56,8 @@
.Fn reallocf "void *ptr" "size_t size"
.Ft void
.Fn free "void *ptr"
-.Ft char *
-.Va _malloc_options
+.Ft const char *
+.Va _malloc_options;
.Ft void
.Fn \*(lp*_malloc_message\*(rp "char *p1" "char *p2" "char *p3" "char *p4"
.Sh DESCRIPTION
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 43aad2d..d2371bd 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -267,7 +267,7 @@ static void *malloc_brk;
static struct pgfree *px;
/* compile-time options */
-char *_malloc_options;
+const char *_malloc_options;
/* Name of the current public function */
static char *malloc_func;
OpenPOWER on IntegriCloud