mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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:14:39 -04:00
parent 1eb2231fc4
commit 73d9a90814
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/port/dynloader/freebsd.c
View File

@ -1,10 +1,10 @@
/* src/backend/port/dynloader/freebsd.c */
/* /*
* Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
* Portions Copyright (c) 1990 The Regents of the University of California. * Portions Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
* src/backend/port/dynloader/freebsd.c
*
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -57,7 +57,7 @@ BSD44_derived_dlerror(void)
void * void *
BSD44_derived_dlopen(const char *file, int num) BSD44_derived_dlopen(const char *file, int num)
{ {
#if defined(__mips__) #if !defined(HAVE_DLOPEN)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlopen (%s) not supported", file); "dlopen (%s) not supported", file);
return NULL; return NULL;
@ -74,7 +74,7 @@ BSD44_derived_dlopen(const char *file, int num)
void * void *
BSD44_derived_dlsym(void *handle, const char *name) BSD44_derived_dlsym(void *handle, const char *name)
{ {
#if defined(__mips__) #if !defined(HAVE_DLOPEN)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlsym (%s) failed", name); "dlsym (%s) failed", name);
return NULL; return NULL;
@ -89,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
snprintf(buf, sizeof(buf), "_%s", name); snprintf(buf, sizeof(buf), "_%s", name);
name = buf; name = buf;
} }
#endif #endif /* !__ELF__ */
if ((vp = dlsym(handle, (char *) name)) == NULL) if ((vp = dlsym(handle, (char *) name)) == NULL)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlsym (%s) failed", name); "dlsym (%s) failed", name);
@ -100,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
void void
BSD44_derived_dlclose(void *handle) BSD44_derived_dlclose(void *handle)
{ {
#if defined(__mips__) #if defined(HAVE_DLOPEN)
#else
dlclose(handle); dlclose(handle);
#endif #endif
} }

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

@ -78,10 +78,10 @@ BSD44_derived_dlsym(void *handle, const char *name)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlsym (%s) failed", name); "dlsym (%s) failed", name);
return NULL; return NULL;
#elif defined(__ELF__)
return dlsym(handle, name);
#else #else
void *vp; void *vp;
#ifndef __ELF__
char buf[BUFSIZ]; char buf[BUFSIZ];
if (*name != '_') if (*name != '_')
@ -89,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
snprintf(buf, sizeof(buf), "_%s", name); snprintf(buf, sizeof(buf), "_%s", name);
name = buf; name = buf;
} }
#endif /* !__ELF__ */
if ((vp = dlsym(handle, (char *) name)) == NULL) if ((vp = dlsym(handle, (char *) name)) == NULL)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlsym (%s) failed", name); "dlsym (%s) failed", name);

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

@ -57,7 +57,7 @@ BSD44_derived_dlerror(void)
void * void *
BSD44_derived_dlopen(const char *file, int num) BSD44_derived_dlopen(const char *file, int num)
{ {
#if defined(__mips__) #if !defined(HAVE_DLOPEN)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlopen (%s) not supported", file); "dlopen (%s) not supported", file);
return NULL; return NULL;
@ -74,14 +74,14 @@ BSD44_derived_dlopen(const char *file, int num)
void * void *
BSD44_derived_dlsym(void *handle, const char *name) BSD44_derived_dlsym(void *handle, const char *name)
{ {
#if defined(__mips__) #if !defined(HAVE_DLOPEN)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlsym (%s) failed", name); "dlsym (%s) failed", name);
return NULL; return NULL;
#elif defined(__ELF__)
return dlsym(handle, name);
#else #else
void *vp; void *vp;
#ifndef __ELF__
char buf[BUFSIZ]; char buf[BUFSIZ];
if (*name != '_') if (*name != '_')
@ -89,6 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
snprintf(buf, sizeof(buf), "_%s", name); snprintf(buf, sizeof(buf), "_%s", name);
name = buf; name = buf;
} }
#endif /* !__ELF__ */
if ((vp = dlsym(handle, (char *) name)) == NULL) if ((vp = dlsym(handle, (char *) name)) == NULL)
snprintf(error_message, sizeof(error_message), snprintf(error_message, sizeof(error_message),
"dlsym (%s) failed", name); "dlsym (%s) failed", name);
@ -99,8 +100,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
void void
BSD44_derived_dlclose(void *handle) BSD44_derived_dlclose(void *handle)
{ {
#if defined(__mips__) #if defined(HAVE_DLOPEN)
#else
dlclose(handle); dlclose(handle);
#endif #endif
} }