summaryrefslogtreecommitdiff
path: root/src/backend/port/dynloader
diff options
context:
space:
mode:
authorBruce Momjian1998-09-01 03:29:17 +0000
committerBruce Momjian1998-09-01 03:29:17 +0000
commitaf74855a608da4cd7ef88ceb2241ec1c75537f39 (patch)
tree912ecaa0cdd84297ad886df5ed7c046c7c501411 /src/backend/port/dynloader
parent2aa080fc933cac47205bc79f026fc89dab0e5149 (diff)
Renaming cleanup, no pgindent yet.
Diffstat (limited to 'src/backend/port/dynloader')
-rw-r--r--src/backend/port/dynloader/bsd.c6
-rw-r--r--src/backend/port/dynloader/bsdi.c2
-rw-r--r--src/backend/port/dynloader/hpux.c6
-rw-r--r--src/backend/port/dynloader/linux.c8
-rw-r--r--src/backend/port/dynloader/ultrix4.c4
5 files changed, 13 insertions, 13 deletions
diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c
index 4d679731ea1..92412c07d66 100644
--- a/src/backend/port/dynloader/bsd.c
+++ b/src/backend/port/dynloader/bsd.c
@@ -55,7 +55,7 @@ BSD44_derived_dlerror(void)
strcpy(ret, error_message);
error_message[0] = 0;
- return ((ret[0] == 0) ? (char *) NULL : ret);
+ return (ret[0] == 0) ? (char *) NULL : ret;
}
void *
@@ -69,7 +69,7 @@ BSD44_derived_dlopen(const char *file, int num)
if ((vp = dlopen((char *) file, num)) == (void *) NULL)
sprintf(error_message, "dlopen (%s) failed", file);
- return (vp);
+ return vp;
#endif
}
@@ -90,7 +90,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
}
if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
sprintf(error_message, "dlsym (%s) failed", name);
- return (vp);
+ return vp;
#endif
}
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index f01c16071b5..1e62b58ad68 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -22,7 +22,7 @@
#include "utils/elog.h"
#include "fmgr.h"
-extern char pg_pathname[];
+extern char *pg_pathname;
void *
pg_dlopen(char *filename)
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 948faea34f4..4e8f252bce8 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.4 1998/06/15 19:28:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.5 1998/09/01 03:24:39 momjian Exp $
*
* NOTES
* all functions are defined here -- it's impossible to trace the
@@ -29,7 +29,7 @@ pg_dlopen(char *filename)
{
shl_t handle = shl_load(filename, BIND_DEFERRED, 0);
- return ((void *) handle);
+ return (void *) handle;
}
func_ptr
@@ -39,7 +39,7 @@ pg_dlsym(void *handle, char *funcname)
if (shl_findsym((shl_t *) & handle, funcname, TYPE_PROCEDURE, &f) == -1)
f = (func_ptr) NULL;
- return (f);
+ return f;
}
void
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index aa13f09a19b..c7480e0be98 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.8 1998/06/15 19:28:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.9 1998/09/01 03:24:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,14 +26,14 @@
#include "fmgr.h"
#if FALSE
-extern char pg_pathname[];
+extern char *pg_pathname;
void *
pg_dlopen(char *filename)
{
#ifndef HAVE_DLD_H
elog(ERROR, "dynamic load not supported");
- return (NULL);
+ return NULL;
#else
static int dl_initialized = 0;
@@ -106,7 +106,7 @@ char *
pg_dlerror()
{
#ifndef HAVE_DLD_H
- return ("dynaloader unspported");
+ return "dynaloader unspported";
#else
return dld_strerror(dld_errno);
#endif
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index 9ddda044ff9..51abd4bb4aa 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.2 1998/06/15 19:28:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.3 1998/09/01 03:24:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,7 @@
#include "port-protos.h"
#include "utils/elog.h"
-extern char pg_pathname[];
+extern char *pg_pathname;
void *
pg_dlopen(char *filename)