diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-05-30 21:59:16 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-05-30 21:59:16 +0000 |
| commit | ff84d98ac29a0531675468b280f0dcf564fd5756 (patch) | |
| tree | 6dec17cad03603ad4a74b4110bebd8ddb6caa464 | |
| parent | c706ddb0fc732639ee77e15e79a3f3fdab34e899 (diff) | |
Notes
| -rw-r--r-- | include/stdlib.h | 2 | ||||
| -rw-r--r-- | lib/libc/stdlib/malloc.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/stdlib.h b/include/stdlib.h index 086cdddc0f10..cba878afcd0c 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -125,7 +125,7 @@ size_t wcstombs(char *, const wchar_t *, size_t); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) extern const char *_malloc_options; -extern void (*_malloc_message)(char *p1, char *p2, char *p3, char *p4); +extern void (*_malloc_message)(const char *p1, const char *p2, const char *p3, const char *p4); int putenv(const char *); int setenv(const char *, const char *, int); diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 0d26f9621cce..3bf29322e9a7 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -286,7 +286,7 @@ static void ifree(void *ptr); static void *irealloc(void *ptr, size_t size); static void -wrtmessage(char *p1, char *p2, char *p3, char *p4) +wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4) { _write(STDERR_FILENO, p1, strlen(p1)); @@ -295,7 +295,8 @@ wrtmessage(char *p1, char *p2, char *p3, char *p4) _write(STDERR_FILENO, p4, strlen(p4)); } -void (*_malloc_message)(char *p1, char *p2, char *p3, char *p4) = wrtmessage; +void (*_malloc_message)(const char *p1, const char *p2, const char *p3, + const char *p4) = wrtmessage; static void wrterror(char *p) @@ -401,7 +402,8 @@ extend_pgdir(u_long index) static void malloc_init () { - char *p, b[64]; + const char *p; + char b[64]; int i, j; int errnosave; |