summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorotto <>2023-05-27 04:33:00 +0000
committerotto <>2023-05-27 04:33:00 +0000
commit554239a1a00c924c930a5c40df5b85d0b4c0e1a4 (patch)
tree07630d2e3e0d85e24e4ab83ed8c9a8734ef575a3
parent60f03123a4643b375e7e15b8d8dd32beeba4deac (diff)
downloadopenbsd-554239a1a00c924c930a5c40df5b85d0b4c0e1a4.tar.gz
openbsd-554239a1a00c924c930a5c40df5b85d0b4c0e1a4.tar.bz2
openbsd-554239a1a00c924c930a5c40df5b85d0b4c0e1a4.zip
Remove malloc interposition, a workaround that was once needed for emacs
ok guenther@
-rw-r--r--src/lib/libc/stdlib/malloc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index a6728b2606..316ae4f484 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc.c,v 1.283 2023/05/10 07:58:06 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.284 2023/05/27 04:33:00 otto Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011, 2016, 2023 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011, 2016, 2023 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -1417,7 +1417,7 @@ malloc(size_t size)
1417 EPILOGUE() 1417 EPILOGUE()
1418 return r; 1418 return r;
1419} 1419}
1420/*DEF_STRONG(malloc);*/ 1420DEF_STRONG(malloc);
1421 1421
1422void * 1422void *
1423malloc_conceal(size_t size) 1423malloc_conceal(size_t size)
@@ -1620,7 +1620,7 @@ free(void *ptr)
1620 _MALLOC_UNLOCK(d->mutex); 1620 _MALLOC_UNLOCK(d->mutex);
1621 errno = saved_errno; 1621 errno = saved_errno;
1622} 1622}
1623/*DEF_STRONG(free);*/ 1623DEF_STRONG(free);
1624 1624
1625static void 1625static void
1626freezero_p(void *ptr, size_t sz) 1626freezero_p(void *ptr, size_t sz)
@@ -1841,7 +1841,7 @@ realloc(void *ptr, size_t size)
1841 EPILOGUE() 1841 EPILOGUE()
1842 return r; 1842 return r;
1843} 1843}
1844/*DEF_STRONG(realloc);*/ 1844DEF_STRONG(realloc);
1845 1845
1846/* 1846/*
1847 * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX 1847 * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
@@ -1872,7 +1872,7 @@ calloc(size_t nmemb, size_t size)
1872 EPILOGUE() 1872 EPILOGUE()
1873 return r; 1873 return r;
1874} 1874}
1875/*DEF_STRONG(calloc);*/ 1875DEF_STRONG(calloc);
1876 1876
1877void * 1877void *
1878calloc_conceal(size_t nmemb, size_t size) 1878calloc_conceal(size_t nmemb, size_t size)
@@ -2189,7 +2189,7 @@ err:
2189 errno = saved_errno; 2189 errno = saved_errno;
2190 return res; 2190 return res;
2191} 2191}
2192/*DEF_STRONG(posix_memalign);*/ 2192DEF_STRONG(posix_memalign);
2193 2193
2194void * 2194void *
2195aligned_alloc(size_t alignment, size_t size) 2195aligned_alloc(size_t alignment, size_t size)
@@ -2214,7 +2214,7 @@ aligned_alloc(size_t alignment, size_t size)
2214 EPILOGUE() 2214 EPILOGUE()
2215 return r; 2215 return r;
2216} 2216}
2217/*DEF_STRONG(aligned_alloc);*/ 2217DEF_STRONG(aligned_alloc);
2218 2218
2219#ifdef MALLOC_STATS 2219#ifdef MALLOC_STATS
2220 2220