diff options
| author | Wilco Dijkstra <wdijkstr@arm.com> | 2017-03-13 18:42:35 +0000 |
|---|---|---|
| committer | Wilco Dijkstra <wdijkstr@arm.com> | 2017-03-13 18:45:42 +0000 |
| commit | ae65d4f3c3995279ca458c460ebf8bab1885fa03 (patch) | |
| tree | afedd4aa53c009f9fe4b98d384a52db229d244a7 /intl | |
| parent | 53a4608f8de7a89a41917ffeba9cd2098d6dec86 (diff) | |
| download | glibc-ae65d4f3c3995279ca458c460ebf8bab1885fa03.tar.gz glibc-ae65d4f3c3995279ca458c460ebf8bab1885fa03.tar.xz glibc-ae65d4f3c3995279ca458c460ebf8bab1885fa03.zip | |
Remove the str(n)dup inlines from string/bits/string2.h. Although inlining
calls with constant strings shows a small (~10%) performance gain, strdup is
typically used in error reporting code, so not performance critical.
Remove the now unused __need_malloc_and_calloc related defines from stdlib.h.
Rename existing uses of str(n)dup to __str(n)dup so it no longer needs to be
redirected to a builtin. Also building GLIBC with -Os now no longer shows
localplt or linkname space failures (partial fix for BZ #15105 and BZ #19463).
[BZ #15105]
[BZ #19463]
* elf/dl-cache.c (_dl_load_cache_lookup): Use __strdup.
* inet/rcmd.c (rcmd_af): Likewise.
* inet/rexec.c (rexec_af): Likewise.
* intl/dcigettext.c (_LIBC): Likewise.
* intl/finddomain.c (_nl_find_domain): Use strdup expansion.
* locale/loadarchive.c (_nl_load_locale_from_archive): Use __strdup.
* locale/setlocale.c (setlocale): Likewise.
* posix/spawn_faction_addopen.c
(posix_spawn_file_actions_addopen): Likewise.
* stdlib/putenv.c (putenv): Use __strndup.
* sunrpc/svc_simple.c (__registerrpc): Use __strdup.
* sysdeps/posix/getaddrinfo.c (gaih_inet): Use __strdup/__strndup.
* include/stdlib.h (__need_malloc_and_calloc): Remove uses.
(__Need_M_And_C) Remove define/undef.
* stdlib/stdlib.h (__need_malloc_and_calloc): Remove uses.
(__malloc_and_calloc_defined): Remove define.
* string/bits/string2.h (__strdup): Remove define.
(strdup): Likewise.
(__strndup): Likewise.
(strndup): Likewise.
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/dcigettext.c | 1 | ||||
| -rw-r--r-- | intl/finddomain.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 95fa72b1c5..3843b7cbdf 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -131,6 +131,7 @@ extern int errno; /* Rename the non ANSI C functions. This is required by the standard because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ +# define strdup __strdup # define getcwd __getcwd # ifndef stpcpy # define stpcpy __stpcpy diff --git a/intl/finddomain.c b/intl/finddomain.c index cb61a0c8d6..88fd880dbc 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -124,18 +124,12 @@ _nl_find_domain (const char *dirname, char *locale, alias_value = _nl_expand_alias (locale); if (alias_value != NULL) { -#if defined _LIBC || defined HAVE_STRDUP - locale = strdup (alias_value); - if (locale == NULL) - return NULL; -#else size_t len = strlen (alias_value) + 1; locale = (char *) malloc (len); if (locale == NULL) return NULL; memcpy (locale, alias_value, len); -#endif } /* Now we determine the single parts of the locale name. First |