diff options
author | Tom Lane | 2011-04-07 19:14:56 +0000 |
---|---|---|
committer | Tom Lane | 2011-04-07 19:14:56 +0000 |
commit | ec31cdeb885ed425872e4e75b187a1d222073a10 (patch) | |
tree | 7adce4073b99d0b95e6a2fb5a4180176ad5393ab | |
parent | 9a9c7c2eb10b8df67c5652a6678a172b83a262eb (diff) |
Modernize dlopen interface code for FreeBSD and OpenBSD.
Remove the hard-wired assumption that __mips__ (and only __mips__) lacks
dlopen in FreeBSD and OpenBSD. This assumption is outdated at least for
OpenBSD, as per report from an anonymous 9.1 tester. We can perfectly well
use HAVE_DLOPEN instead to decide which code to use.
Some other cosmetic adjustments to make freebsd.c, netbsd.c, and openbsd.c
exactly alike.
-rw-r--r-- | src/backend/port/dynloader/freebsd.c | 9 | ||||
-rw-r--r-- | src/backend/port/dynloader/netbsd.c | 5 | ||||
-rw-r--r-- | src/backend/port/dynloader/openbsd.c | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c index 4e634ef5886..ada6aed7a3d 100644 --- a/src/backend/port/dynloader/freebsd.c +++ b/src/backend/port/dynloader/freebsd.c @@ -57,7 +57,7 @@ BSD44_derived_dlerror(void) void * BSD44_derived_dlopen(const char *file, int num) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlopen (%s) not supported", file); return NULL; @@ -74,7 +74,7 @@ BSD44_derived_dlopen(const char *file, int num) void * BSD44_derived_dlsym(void *handle, const char *name) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); return NULL; @@ -89,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } -#endif +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); @@ -100,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name) void BSD44_derived_dlclose(void *handle) { -#if defined(__mips__) -#else +#if defined(HAVE_DLOPEN) dlclose(handle); #endif } diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c index 698986e0a16..001e4ee6896 100644 --- a/src/backend/port/dynloader/netbsd.c +++ b/src/backend/port/dynloader/netbsd.c @@ -78,10 +78,10 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); return NULL; -#elif defined(__ELF__) - return dlsym(handle, name); #else void *vp; + +#ifndef __ELF__ char buf[BUFSIZ]; if (*name != '_') @@ -89,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c index 1bd6c3550de..e09199feb8a 100644 --- a/src/backend/port/dynloader/openbsd.c +++ b/src/backend/port/dynloader/openbsd.c @@ -57,7 +57,7 @@ BSD44_derived_dlerror(void) void * BSD44_derived_dlopen(const char *file, int num) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlopen (%s) not supported", file); return NULL; @@ -74,14 +74,14 @@ BSD44_derived_dlopen(const char *file, int num) void * BSD44_derived_dlsym(void *handle, const char *name) { -#if defined(__mips__) +#if !defined(HAVE_DLOPEN) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); return NULL; -#elif defined(__ELF__) - return dlsym(handle, name); #else void *vp; + +#ifndef __ELF__ char buf[BUFSIZ]; if (*name != '_') @@ -89,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); @@ -99,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name) void BSD44_derived_dlclose(void *handle) { -#if defined(__mips__) -#else +#if defined(HAVE_DLOPEN) dlclose(handle); #endif } |