database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-06 19:59:18 +03:00
Code

Modernize dlopen interface code for FreeBSD and OpenBSD.

Browse Source 
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.
This commit is contained in:
Tom Lane 2011-04-07 15:15:00 -04:00
parent 00a9229060
commit 1de4b9afe6
3 changed files with 13 additions and 13 deletions
src/backend/port/dynloader
freebsd.cnetbsd.copenbsd.c

9
src/backend/port/dynloader/freebsd.c

@ -61,7 +61,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;
@ -78,7 +78,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;
@ -93,7 +93,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);
@ -104,8 +104,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
}

5
src/backend/port/dynloader/netbsd.c

@ -82,10 +82,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 != '_')
@ -93,6 +93,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);

12
src/backend/port/dynloader/openbsd.c

@ -61,7 +61,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;
@ -78,14 +78,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 != '_')
@ -93,6 +93,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);
@ -103,8 +104,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
}