Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/stdlib use strerror_r_ss()



details:   https://anonhg.NetBSD.org/src/rev/5d9ab34ae947
branches:  trunk
changeset: 824044:5d9ab34ae947
user:      christos <christos%NetBSD.org@localhost>
date:      Fri May 19 19:51:10 2017 +0000

description:
use strerror_r_ss()

diffstat:

 lib/libc/stdlib/jemalloc.c |  32 ++++++++------------------------
 1 files changed, 8 insertions(+), 24 deletions(-)

diffs (53 lines):

diff -r 54fa480db8fd -r 5d9ab34ae947 lib/libc/stdlib/jemalloc.c
--- a/lib/libc/stdlib/jemalloc.c        Fri May 19 19:48:19 2017 +0000
+++ b/lib/libc/stdlib/jemalloc.c        Fri May 19 19:51:10 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: jemalloc.c,v 1.40 2016/04/12 18:07:08 joerg Exp $      */
+/*     $NetBSD: jemalloc.c,v 1.41 2017/05/19 19:51:10 christos Exp $   */
 
 /*-
  * Copyright (C) 2006,2007 Jason Evans <jasone%FreeBSD.org@localhost>.
@@ -118,7 +118,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */ 
-__RCSID("$NetBSD: jemalloc.c,v 1.40 2016/04/12 18:07:08 joerg Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.41 2017/05/19 19:51:10 christos Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -162,28 +162,12 @@
 #ifdef __NetBSD__
 #  include <reentrant.h>
 #  include "extern.h"
-
-#define STRERROR_R(a, b, c)    __strerror_r(a, b, c);
-/*
- * A non localized version of strerror, that avoids bringing in
- * stdio and the locale code. All the malloc messages are in English
- * so why bother?
- */
-static int
-__strerror_r(int e, char *s, size_t l)
-{
-       int rval;
-       size_t slen;
-
-       if (e >= 0 && e < sys_nerr) {
-               slen = strlcpy(s, sys_errlist[e], l);
-               rval = 0;
-       } else {
-               slen = snprintf_ss(s, l, "Unknown error %u", e);
-               rval = EINVAL;
-       }
-       return slen >= l ? ERANGE : rval;
-}
+__strong_alias(__libc_malloc,malloc)
+__strong_alias(__libc_realloc,realloc)
+__strong_alias(__libc_calloc,calloc)
+__strong_alias(__libc_free,free)
+
+#define STRERROR_R(a, b, c)    strerror_r_ss(a, b, c);
 #endif
 
 #ifdef __FreeBSD__



Home | Main Index | Thread Index | Old Index