about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-01-06 22:03:38 -0500
committerRich Felker <dalias@aerifal.cx>2014-01-06 22:03:38 -0500
commit839cc4e6da609a0b24f6cc32b0b11558fd77dd83 (patch)
tree7fd422f53978a8630cd7264dc268fcbd72859ed6
parent1e7a581ad6e2b03e91748dd1295288e053f86e04 (diff)
downloadmusl-839cc4e6da609a0b24f6cc32b0b11558fd77dd83.tar.gz
musl-839cc4e6da609a0b24f6cc32b0b11558fd77dd83.tar.xz
musl-839cc4e6da609a0b24f6cc32b0b11558fd77dd83.zip
const-qualify the address argument to dladdr
this agrees with implementation practice on glibc and BSD systems, and
is the const-correct way to do things; it eliminates warnings from
passing pointers to const. the prototype without const came from
seemingly erroneous man pages.
-rw-r--r--include/dlfcn.h2
-rw-r--r--src/ldso/dladdr.c4
-rw-r--r--src/ldso/dynlink.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/include/dlfcn.h b/include/dlfcn.h
index db26194b..78fb0733 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -31,7 +31,7 @@ typedef struct {
 	const char *dli_sname;
 	void *dli_saddr;
 } Dl_info;
-int dladdr(void *, Dl_info *);
+int dladdr(const void *, Dl_info *);
 int dlinfo(void *, int, void *);
 #endif
 
diff --git a/src/ldso/dladdr.c b/src/ldso/dladdr.c
index 265bb681..7ca718f4 100644
--- a/src/ldso/dladdr.c
+++ b/src/ldso/dladdr.c
@@ -1,9 +1,9 @@
 #define _GNU_SOURCE
 #include <dlfcn.h>
 
-int __dladdr(void *, Dl_info *);
+int __dladdr(const void *, Dl_info *);
 
-int dladdr(void *addr, Dl_info *info)
+int dladdr(const void *addr, Dl_info *info)
 {
 	return __dladdr(addr, info);
 }
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 27d92f2b..89e1260b 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -1331,7 +1331,7 @@ failed:
 	return 0;
 }
 
-int __dladdr(void *addr, Dl_info *info)
+int __dladdr(const void *addr, Dl_info *info)
 {
 	struct dso *p;
 	Sym *sym;
@@ -1441,7 +1441,7 @@ void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra)
 {
 	return 0;
 }
-int __dladdr (void *addr, Dl_info *info)
+int __dladdr (const void *addr, Dl_info *info)
 {
 	return 0;
 }