[git commit future 1/1] libdl: no need for _dl_strstr in libdl, use strstr

Khem Raj raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=51bc52eff090d84edd4d37b26cf6f50d19b2a7a9
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 ldso/include/dl-string.h |    1 -
 ldso/libdl/libdl.c       |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
index 4d1fdb7..712f2b6 100644
--- a/ldso/include/dl-string.h
+++ b/ldso/include/dl-string.h
@@ -204,7 +204,6 @@ static __always_inline char * _dl_get_last_path_component(char *path)
 # define _dl_strcpy strcpy
 # define _dl_strcmp strcmp
 # define _dl_strrchr strrchr
-# define _dl_strstr strstr
 # define _dl_memcpy memcpy
 # define _dl_memcmp memcmp
 # define _dl_memset memset
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 6f4dd44..e442e90 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -308,7 +308,7 @@ void *dlopen(const char *libname, int flag)
 # ifdef __SUPPORT_LD_DEBUG__
 	_dl_debug = getenv("LD_DEBUG");
 	if (_dl_debug) {
-		if (_dl_strstr(_dl_debug, "all")) {
+		if (strstr(_dl_debug, "all")) {
 			_dl_debug_detail = _dl_debug_move = _dl_debug_symbols
 				= _dl_debug_reloc = _dl_debug_bindings = _dl_debug_nofixups = (void*)1;
 		} else {
-- 
1.7.3.4



More information about the uClibc-cvs mailing list