tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "dlerror returns char*, not const char*."

Browse source
This commit is contained in:
Treehugger Robot 2016-08-11 23:16:59 +00:00 committed by Gerrit Code Review
commit 166f875eab
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libc/include/dlfcn.h
View file

@ -51,7 +51,7 @@ typedef struct {
void* dlopen(const char* filename, int flag);
int dlclose(void* _Nonnull handle);
const char* dlerror(void);
char* dlerror(void);
void* dlsym(void* handle, const char* _Nonnull symbol);
void* dlvsym(void* handle, const char* _Nonnull symbol, const char* _Nonnull version) __INTRODUCED_IN(24);
int dladdr(const void* addr, Dl_info* _Nonnull info);

2
libdl/libdl.c
View file

@ -25,7 +25,7 @@
void* dlopen(const char* filename __unused, int flag __unused) { return 0; }
const char* dlerror(void) { return 0; }
char* dlerror(void) { return 0; }
void* dlsym(void* handle __unused, const char* symbol __unused) { return 0; }

8
linker/dlfcn.cpp
View file

@ -33,10 +33,10 @@
static pthread_mutex_t g_dl_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
static const char* __bionic_set_dlerror(char* new_value) {
static char* __bionic_set_dlerror(char* new_value) {
char** dlerror_slot = &reinterpret_cast<char**>(__get_tls())[TLS_SLOT_DLERROR];
const char* old_value = *dlerror_slot;
char* old_value = *dlerror_slot;
*dlerror_slot = new_value;
return old_value;
}
@ -52,8 +52,8 @@ static void __bionic_format_dlerror(const char* msg, const char* detail) {
__bionic_set_dlerror(buffer);
}
const char* dlerror() {
const char* old_value = __bionic_set_dlerror(nullptr);
char* dlerror() {
char* old_value = __bionic_set_dlerror(nullptr);
return old_value;
}