summary refs log tree commit diff
path: root/elf/dl-deps.c
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
commit2bd86632b7cb97dc9002a23795e140fc880e1987 (patch)
treed85631a92d8c269b7ecc09a172a1a32c1ae28fb0 /elf/dl-deps.c
parent1c36e1e6a5b9b6f9ad1c67f5d43383afb4d80339 (diff)
downloadglibc-2bd86632b7cb97dc9002a23795e140fc880e1987.tar.gz
glibc-2bd86632b7cb97dc9002a23795e140fc880e1987.tar.xz
glibc-2bd86632b7cb97dc9002a23795e140fc880e1987.zip
elf: remove redundant is_path argument
is_path argument is no longer used and could be safely removed.

* elf/dl-dst.h (DL_DST_COUNT): Remove is_path argument, all callers
updated.
* elf/dl-load.c (is_dst, _dl_dst_count, _dl_dst_substitute,
expand_dynamic_string_token): Likewise.
* sysdeps/generic/ldsodefs.h (_dl_dst_count, _dl_dst_substitute): Remove
is_path argument.
Diffstat (limited to 'elf/dl-deps.c')
-rw-r--r--elf/dl-deps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 622331e6e2..46ceb4adfe 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -100,7 +100,7 @@ struct list
   ({									      \
     const char *__str = (str);						      \
     const char *__result = __str;					      \
-    size_t __dst_cnt = DL_DST_COUNT (__str, 0);				      \
+    size_t __dst_cnt = DL_DST_COUNT (__str);				      \
 									      \
     if (__dst_cnt != 0)							      \
       {									      \
@@ -114,7 +114,7 @@ DST not allowed in SUID/SGID programs"));				      \
 	__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str),  \
 						   __dst_cnt));		      \
 									      \
-	__result = _dl_dst_substitute (l, __str, __newp, 0);		      \
+	__result = _dl_dst_substitute (l, __str, __newp);		      \
 									      \
 	if (*__result == '\0')						      \
 	  {								      \