From 69422e28dd3f7714b2dc2bd5e00dbe0c653a5e21 Mon Sep 17 00:00:00 2001 From: qiuyiuestc Date: Wed, 17 Nov 2010 16:23:23 +0000 Subject: [PATCH] delete rt_ prefix in libdl git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1054 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/libdl/dlclose.c | 4 ++-- components/libdl/dlerror.c | 4 ++-- components/libdl/dlfcn.h | 8 ++++---- components/libdl/dlopen.c | 4 ++-- components/libdl/dlsym.c | 8 +++++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/components/libdl/dlclose.c b/components/libdl/dlclose.c index e040a21396..854dd6a032 100644 --- a/components/libdl/dlclose.c +++ b/components/libdl/dlclose.c @@ -15,7 +15,7 @@ #include #include -int rt_dlclose (void *handle) +int dlclose (void *handle) { rt_module_t module; @@ -32,5 +32,5 @@ int rt_dlclose (void *handle) return RT_TRUE; } -RTM_EXPORT(rt_dlclose) +RTM_EXPORT(dlclose) diff --git a/components/libdl/dlerror.c b/components/libdl/dlerror.c index a4728a8a88..375bd1de3f 100644 --- a/components/libdl/dlerror.c +++ b/components/libdl/dlerror.c @@ -15,10 +15,10 @@ #include #include -const char *rt_dlerror(void) +const char *dlerror(void) { return "TODO"; } -RTM_EXPORT(rt_dlerror) +RTM_EXPORT(dlerror) diff --git a/components/libdl/dlfcn.h b/components/libdl/dlfcn.h index eea1d02d4b..0569dedd1b 100644 --- a/components/libdl/dlfcn.h +++ b/components/libdl/dlfcn.h @@ -10,7 +10,7 @@ #define RTLD_DEFAULT ((void*)1) #define RTLD_NEXT ((void*)2) -void *rt_dlopen (const char *filename, int flag); -const char *rt_dlerror(void); -void *rt_dlsym(void *handle, const char *symbol); -int rt_dlclose (void *handle); +void *dlopen (const char *filename, int flag); +const char *dlerror(void); +void *dlsym(void *handle, const char *symbol); +int dlclose (void *handle); diff --git a/components/libdl/dlopen.c b/components/libdl/dlopen.c index d392a94523..00405523e4 100644 --- a/components/libdl/dlopen.c +++ b/components/libdl/dlopen.c @@ -15,7 +15,7 @@ #include #include -void* rt_dlopen(const char *filename, int flags) +void* dlopen(const char *filename, int flags) { rt_module_t module; @@ -35,5 +35,5 @@ void* rt_dlopen(const char *filename, int flags) } } -RTM_EXPORT(rt_dlopen) +RTM_EXPORT(dlopen) diff --git a/components/libdl/dlsym.c b/components/libdl/dlsym.c index d1b5266ce1..67663bc324 100644 --- a/components/libdl/dlsym.c +++ b/components/libdl/dlsym.c @@ -15,13 +15,15 @@ #include #include -void* rt_dlsym(void *handle, const char* symbol) +void* dlsym(void *handle, const char* symbol) { int i; - rt_module_t module = (rt_module_t)handle; + rt_module_t module; RT_ASSERT(handle != RT_NULL); + module = (rt_module_t)handle; + for(i=0; insym; i++) { if (rt_strcmp(module->symtab[i].name, symbol) == 0) @@ -31,5 +33,5 @@ void* rt_dlsym(void *handle, const char* symbol) return RT_NULL; } -RTM_EXPORT(rt_dlsym) +RTM_EXPORT(dlsym)