Revert all changes to dln.c, dmydln.c, dln.h for the shared GC

dln.c

@@ -76,12 +76,6 @@ void *xrealloc();
 # include <unistd.h>
 #endif
 
-bool
-dln_supported_p(void)
-{
-    return true;
-}
-
 #ifndef dln_loaderror
 static void
 dln_loaderror(const char *format, ...)
@@ -200,6 +194,7 @@ dln_strerror(char *message, size_t size)
     }
     return message;
 }
+#define dln_strerror() dln_strerror(message, sizeof message)
 #elif defined USE_DLN_DLOPEN
 static const char *
 dln_strerror(void)
@@ -344,13 +339,16 @@ dln_disable_dlclose(void)
 #endif
 
 #if defined(_WIN32) || defined(USE_DLN_DLOPEN)
-void *
+static void *
-dln_open(const char *file, char *error, size_t size)
+dln_open(const char *file)
 {
     static const char incompatible[] = "incompatible library version";
+    const char *error = NULL;
     void *handle;
 
 #if defined(_WIN32)
+    char message[1024];
+
     /* Convert the file path to wide char */
     WCHAR *winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
     if (!winfile) {
@@ -362,15 +360,15 @@ dln_open(const char *file, char *error, size_t size)
     free(winfile);
 
     if (!handle) {
-        strlcpy(error, dln_strerror(error, size), size);
+        error = dln_strerror();
-        return NULL;
+        goto failed;
     }
 
 # if defined(RUBY_EXPORT)
     if (!rb_w32_check_imported(handle, rb_libruby_handle())) {
         FreeLibrary(handle);
-        strlcpy(error, incompatible, size);
+        error = incompatible;
-        return NULL;
+        goto failed;
     }
 # endif
 
@@ -389,8 +387,8 @@ dln_open(const char *file, char *error, size_t size)
     /* Load file */
     handle = dlopen(file, RTLD_LAZY|RTLD_GLOBAL);
     if (handle == NULL) {
-        strlcpy(error, dln_strerror(), size);
+        error = dln_strerror();
-        return NULL;
+        goto failed;
     }
 
 # if defined(RUBY_EXPORT)
@@ -412,15 +410,11 @@ dln_open(const char *file, char *error, size_t size)
                     libruby_name = tmp;
                 }
                 dlclose(handle);
-
                 if (libruby_name) {
-                    snprintf(error, size, "linked to incompatible %s - %s", libruby_name, file);
+                    dln_loaderror("linked to incompatible %s - %s", libruby_name, file);
                 }
-                else {
+                error = incompatible;
-                    strlcpy(error, incompatible, size);
+                goto failed;
-                }
-
-                return NULL;
             }
         }
     }
@@ -428,9 +422,12 @@ dln_open(const char *file, char *error, size_t size)
 #endif
 
     return handle;
+
+  failed:
+    dln_loaderror("%s - %s", error, file);
 }
 
-void *
+static void *
 dln_sym(void *handle, const char *symbol)
 {
 #if defined(_WIN32)
@@ -449,7 +446,7 @@ dln_sym_func(void *handle, const char *symbol)
         const char *error;
 #if defined(_WIN32)
         char message[1024];
-        error = dln_strerror(message, sizeof(message));
+        error = dln_strerror();
 #elif defined(USE_DLN_DLOPEN)
         const size_t errlen = strlen(error = dln_strerror()) + 1;
         error = memcpy(ALLOCA_N(char, errlen), error, errlen);
@@ -504,12 +501,7 @@ void *
 dln_load(const char *file)
 {
 #if defined(_WIN32) || defined(USE_DLN_DLOPEN)
-    char error[1024];
+    void *handle = dln_open(file);
-    void *handle = dln_open(file, error, sizeof(error));
-
-    if (handle == NULL) {
-        dln_loaderror("%s - %s", error, file);
-    }
 
 #ifdef RUBY_DLN_CHECK_ABI
     typedef unsigned long long abi_version_number;

dln.h

@@ -22,11 +22,9 @@ RUBY_SYMBOL_EXPORT_BEGIN
 #define DLN_FIND_EXTRA_ARG_DECL
 #endif
 
-bool dln_supported_p(void);
 char *dln_find_exe_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
 char *dln_find_file_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
 void *dln_load(const char*);
-void *dln_open(const char *file, char *error, size_t size);
 void *dln_symbol(void*,const char*);
 
 RUBY_SYMBOL_EXPORT_END

dmydln.c

@@ -3,12 +3,6 @@
 
 #include "ruby/ruby.h"
 
-bool
-dln_supported_p(void)
-{
-    return false;
-}
-
 NORETURN(void *dln_load(const char *));
 void*
 dln_load(const char *file)
@@ -26,12 +20,3 @@ dln_symbol(void *handle, const char *symbol)
 
     UNREACHABLE_RETURN(NULL);
 }
-
-void*
-dln_open(const char *library, char *error, size_t size)
-{
-    static const char *error_str = "this executable file can't load extension libraries";
-    strlcpy(error, error_str, size);
-    return NULL;
-}
-