aboutsummaryrefslogtreecommitdiff
path: root/src/backend/port/dynloader
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/port/dynloader')
-rw-r--r--src/backend/port/dynloader/bsd.c4
-rw-r--r--src/backend/port/dynloader/bsdi.c4
-rw-r--r--src/backend/port/dynloader/hpux.c4
-rw-r--r--src/backend/port/dynloader/linux.c6
-rw-r--r--src/backend/port/dynloader/ultrix4.c4
5 files changed, 3 insertions, 19 deletions
diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c
index 957dc297677..4d679731ea1 100644
--- a/src/backend/port/dynloader/bsd.c
+++ b/src/backend/port/dynloader/bsd.c
@@ -68,9 +68,7 @@ BSD44_derived_dlopen(const char *file, int num)
void *vp;
if ((vp = dlopen((char *) file, num)) == (void *) NULL)
- {
sprintf(error_message, "dlopen (%s) failed", file);
- }
return (vp);
#endif
}
@@ -91,9 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
name = buf;
}
if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
- {
sprintf(error_message, "dlsym (%s) failed", name);
- }
return (vp);
#endif
}
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index f23267e5862..f01c16071b5 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -36,9 +36,7 @@ pg_dlopen(char *filename)
if (!dl_initialized)
{
if (dld_init(dld_find_executable(pg_pathname)))
- {
return NULL;
- }
/*
* if there are undefined symbols, we want dl to search from the
@@ -51,9 +49,7 @@ pg_dlopen(char *filename)
* link the file, then check for undefined symbols!
*/
if (dld_link(filename))
- {
return NULL;
- }
/*
* If undefined symbols: try to link with the C and math libraries!
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 0f1517ac966..948faea34f4 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.3 1998/02/26 04:34:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.4 1998/06/15 19:28:59 momjian Exp $
*
* NOTES
* all functions are defined here -- it's impossible to trace the
@@ -38,9 +38,7 @@ pg_dlsym(void *handle, char *funcname)
func_ptr f;
if (shl_findsym((shl_t *) & handle, funcname, TYPE_PROCEDURE, &f) == -1)
- {
f = (func_ptr) NULL;
- }
return (f);
}
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 41507207d07..aa13f09a19b 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.7 1998/02/26 04:34:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.8 1998/06/15 19:28:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,9 +44,7 @@ pg_dlopen(char *filename)
if (!dl_initialized)
{
if (dld_init(dld_find_executable(pg_pathname)))
- {
return NULL;
- }
/*
* if there are undefined symbols, we want dl to search from the
@@ -59,9 +57,7 @@ pg_dlopen(char *filename)
* link the file, then check for undefined symbols!
*/
if (dld_link(filename))
- {
return NULL;
- }
/*
* If undefined symbols: try to link with the C and math libraries!
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index 7d1d493c2bc..9ddda044ff9 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.1 1998/03/10 05:23:40 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.2 1998/06/15 19:28:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,9 +37,7 @@ pg_dlopen(char *filename)
if (!dl_initialized)
{
if (!dl_init(pg_pathname))
- {
return NULL;
- }
/*
* if there are undefined symbols, we want dl to search from the