about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2017-12-20 11:27:51 +0000
committerDmitry V. Levin <ldv@altlinux.org>2017-12-27 22:12:51 +0000
commit1c36e1e6a5b9b6f9ad1c67f5d43383afb4d80339 (patch)
tree6fba8ab0ed5c612b8e90de47a008a60ea499b9aa /ChangeLog
parent97f13188c9fbafeaab89146996b3cce1f4952b5e (diff)
downloadglibc-1c36e1e6a5b9b6f9ad1c67f5d43383afb4d80339.tar.gz
glibc-1c36e1e6a5b9b6f9ad1c67f5d43383afb4d80339.tar.xz
glibc-1c36e1e6a5b9b6f9ad1c67f5d43383afb4d80339.zip
elf: remove redundant code from is_dst
is_dst is called either by _dl_dst_count or by _dl_dst_substitute.
_dl_dst_count is called by DL_DST_COUNT only.
DL_DST_COUNT is called either by expand_dst with is_path == 0
or by expand_dynamic_string_token.
_dl_dst_substitute is called either from expand_dst with is_path == 0
or from expand_dynamic_string_token.
The latter function is called either from _dl_map_object with is_path == 0
or from fillin_rpath with is_path == 1 and name containing no ':'.

In any case (is_path && name[i] == ':') is always false and all code
depending on it can be safely removed.

* elf/dl-load.c (is_dst): Remove checks that is_path is set and name
contains ':', and all code depending on these checks.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 297dd703c5..97aeed5db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2017-12-27  Dmitry V. Levin  <ldv@altlinux.org>
 
+	* elf/dl-load.c (is_dst): Remove checks that is_path is set and name
+	contains ':'.
+
 	* elf/dl-load.c (_dl_dst_substitute): Remove checks that is_path
 	is set and name contains ':', and all code depending on these checks.