Remove obsolete openbsd dynloader code

petere · petere · commit 29351a06af5b · 2018-08-13T23:21:01.000+02:00
dlopen() has been documented since OpenBSD 2.0 (1996).
diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
@@ -1,106 +1,7 @@
 /*
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
- * Portions Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
  * src/backend/port/dynloader/openbsd.c
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
+ * Dummy file used for nothing at this point
  *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * see openbsd.h
  */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
-#endif							/* LIBC_SCCS and not lint */
-
-#include "postgres.h"
-
-#include <nlist.h>
-#include <link.h>
-#include <dlfcn.h>
-
-#include "dynloader.h"
-
-static char error_message[BUFSIZ];
-
-char *
-BSD44_derived_dlerror(void)
-{
-	static char ret[BUFSIZ];
-
-	strcpy(ret, error_message);
-	error_message[0] = 0;
-	return (ret[0] == 0) ? NULL : ret;
-}
-
-void *
-BSD44_derived_dlopen(const char *file, int num)
-{
-#if !defined(HAVE_DLOPEN)
-	snprintf(error_message, sizeof(error_message),
-			 "dlopen (%s) not supported", file);
-	return NULL;
-#else
-	void	   *vp;
-
-	if ((vp = dlopen((char *) file, num)) == NULL)
-		snprintf(error_message, sizeof(error_message),
-				 "dlopen (%s) failed: %s", file, dlerror());
-	return vp;
-#endif
-}
-
-void *
-BSD44_derived_dlsym(void *handle, const char *name)
-{
-#if !defined(HAVE_DLOPEN)
-	snprintf(error_message, sizeof(error_message),
-			 "dlsym (%s) failed", name);
-	return NULL;
-#else
-	void	   *vp;
-
-#ifndef __ELF__
-	char		buf[BUFSIZ];
-
-	if (*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);
-	return vp;
-#endif
-}
-
-void
-BSD44_derived_dlclose(void *handle)
-{
-#if defined(HAVE_DLOPEN)
-	dlclose(handle);
-#endif
-}
diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h
@@ -13,25 +13,10 @@
 #ifndef PORT_PROTOS_H
 #define PORT_PROTOS_H
 
-#include <nlist.h>
-#include <link.h>
 #include <dlfcn.h>
 
 #include "utils/dynamic_loader.h"	/* pgrminclude ignore */
 
-/*
- * Dynamic Loader on NetBSD 1.0.
- *
- * this dynamic loader uses the system dynamic loading interface for shared
- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
- * library as the file to be dynamically loaded.
- *
- * agc - I know this is all a bit crufty, but it does work, is fairly
- * portable, and works (the stipulation that the d.l. function must
- * begin with an underscore is fairly tricky, and some versions of
- * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
- */
-
 /*
  * In some older systems, the RTLD_NOW flag isn't defined and the mode
  * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
@@ -45,14 +30,9 @@
 #define RTLD_GLOBAL 0
 #endif
 
-#define		   pg_dlopen(f)    BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-#define		   pg_dlsym		   BSD44_derived_dlsym
-#define		   pg_dlclose	   BSD44_derived_dlclose
-#define		   pg_dlerror	   BSD44_derived_dlerror
-
-char	   *BSD44_derived_dlerror(void);
-void	   *BSD44_derived_dlopen(const char *filename, int num);
-void	   *BSD44_derived_dlsym(void *handle, const char *name);
-void		BSD44_derived_dlclose(void *handle);
+#define pg_dlopen(f)	dlopen((f), RTLD_NOW | RTLD_GLOBAL)
+#define pg_dlsym		dlsym
+#define pg_dlclose		dlclose
+#define pg_dlerror		dlerror
 
 #endif							/* PORT_PROTOS_H */
