about summary refs log tree commit diff
path: root/elf/do-lookup.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-02-26 20:50:52 +0000
committerUlrich Drepper <drepper@redhat.com>2006-02-26 20:50:52 +0000
commit67d7308c0a772caebcd63633ff9321a5eb5741c2 (patch)
tree5da812247b1932ea58910288a18d2162904b9d6a /elf/do-lookup.h
parent74c5693b2e5475585ccaba8deadf8ca3b58a330a (diff)
downloadglibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.tar.gz
glibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.tar.xz
glibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.zip
* elf/do-lookup.h (do_lookup_x): No need to compare SKIP to NULL
	before comparison with MAP.

	* elf/dl-sym.c (do_sym): For RTLD_NEXT, pass MATCH to
	dl_lookup_symbol_x instead of L.
Diffstat (limited to 'elf/do-lookup.h')
-rw-r--r--elf/do-lookup.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/do-lookup.h b/elf/do-lookup.h
index 62755ea013..7b62b0feec 100644
--- a/elf/do-lookup.h
+++ b/elf/do-lookup.h
@@ -1,5 +1,5 @@
 /* Look up a symbol in the loaded objects.
-   Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ do_lookup_x (const char *undef_name, unsigned long int hash,
       map = list[i]->l_real;
 
       /* Here come the extra test needed for `_dl_lookup_symbol_skip'.  */
-      if (skip != NULL && map == skip)
+      if (map == skip)
 	continue;
 
       /* Don't search the executable when resolving a copy reloc.  */