rbb 01/01/11 20:50:32
Modified: . CHANGES
dso/aix dso.c
dso/beos dso.c
dso/os2 dso.c
dso/os390 dso.c
dso/unix dso.c
dso/win32 dso.c
include apr_dso.h
Log:
Add linkage declarations to the DSO functions.
Submitted by: Gregory Nicholls <[EMAIL PROTECTED]>
Revision Changes Path
1.41 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- CHANGES 2001/01/12 04:18:29 1.40
+++ CHANGES 2001/01/12 04:50:30 1.41
@@ -1,5 +1,8 @@
Changes with APR b1
+ *) Add linkage declarations to the DSO code.
+ [Gregory Nicholls <[EMAIL PROTECTED]>]
+
*) Some adjustment of hints.m4 setting flags (used to check if null
first) and added some verbosity. [Jim Jagielski]
1.9 +6 -6 apr/dso/aix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/aix/dso.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dso.c 2000/11/09 06:08:35 1.8
+++ dso.c 2001/01/12 04:50:30 1.9
@@ -132,8 +132,8 @@
* add the basic "wrappers" here.
*/
-apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
- apr_pool_t *ctx)
+APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
+ const char *path, apr_pool_t *ctx)
{
void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
@@ -146,7 +146,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
+APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
{
if (dlclose(handle->handle) != 0)
return APR_EINIT;
@@ -154,9 +154,9 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym,
- apr_dso_handle_t *handle,
- const char *symname)
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
+ apr_dso_handle_t *handle,
+ const char *symname)
{
void *retval = dlsym(handle->handle, symname);
1.12 +4 -4 apr/dso/beos/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/beos/dso.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dso.c 2000/11/09 06:08:35 1.11
+++ dso.c 2001/01/12 04:50:30 1.12
@@ -56,7 +56,7 @@
#if APR_HAS_DSO
-apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
+APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const
char *path,
apr_pool_t *ctx)
{
image_id newid;
@@ -70,7 +70,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
+APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
{
if(unload_add_on(handle->handle) < B_NO_ERROR)
return APR_EINIT;
@@ -78,7 +78,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_handle_t
*handle,
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
apr_dso_handle_t *handle,
const char *symname)
{
int err;
@@ -95,7 +95,7 @@
return APR_SUCCESS;
}
-const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t
buflen)
+APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer,
apr_size_t buflen)
{
strncpy(strerror(errno), buffer, buflen);
return buffer;
1.17 +6 -6 apr/dso/os2/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/os2/dso.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- dso.c 2000/12/23 03:07:10 1.16
+++ dso.c 2001/01/12 04:50:30 1.17
@@ -68,7 +68,7 @@
}
-apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
apr_pool_t *ctx)
+APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle, const
char *path, apr_pool_t *ctx)
{
char failed_module[200];
HMODULE handle;
@@ -92,7 +92,7 @@
-apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
+APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
{
int rc;
@@ -109,9 +109,9 @@
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym,
- apr_dso_handle_t *handle,
- const char *symname)
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
+ apr_dso_handle_t *handle,
+ const char *symname)
{
PFN func;
int rc;
@@ -128,7 +128,7 @@
-const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t
buflen)
+APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer,
apr_size_t buflen)
{
char message[200];
apr_strerror(dso->load_error, message, sizeof(message));
1.4 +7 -7 apr/dso/os390/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/os390/dso.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dso.c 2000/11/09 06:08:36 1.3
+++ dso.c 2001/01/12 04:50:31 1.4
@@ -65,8 +65,8 @@
return apr_dso_unload(dso);
}
-apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
- apr_pool_t *ctx)
+APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
+ const char *path, apr_pool_t *ctx)
{
dllhandle *handle;
int rc;
@@ -83,7 +83,7 @@
return errno;
}
-apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
+APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
{
int rc;
@@ -100,9 +100,9 @@
return errno;
}
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym,
- apr_dso_handle_t *handle,
- const char *symname)
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
+ apr_dso_handle_t *handle,
+ const char *symname)
{
void *func_ptr;
void *var_ptr;
@@ -119,7 +119,7 @@
return errno;
}
-const char *apr_dso_error(apr_dso_handle_t *handle, char *buffer,
+APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *handle, char
*buffer,
apr_size_t buflen)
{
apr_cpystrn(buffer, strerror(handle->failing_errno), buflen);
1.28 +7 -7 apr/dso/unix/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/unix/dso.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- dso.c 2000/12/15 16:56:54 1.27
+++ dso.c 2001/01/12 04:50:31 1.28
@@ -61,8 +61,8 @@
#include <stddef.h>
#endif
-apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
- apr_pool_t *ctx)
+APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
+ const char *path, apr_pool_t *ctx)
{
#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
shl_t os_handle = shl_load(path,
BIND_IMMEDIATE|BIND_VERBOSE|BIND_NOSTART, 0L);
@@ -91,7 +91,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
+APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle)
{
#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
shl_unload((shl_t)handle->handle);
@@ -104,9 +104,9 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym,
- apr_dso_handle_t *handle,
- const char *symname)
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
+ apr_dso_handle_t *handle,
+ const char *symname)
{
#if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
void *symaddr = NULL;
@@ -146,7 +146,7 @@
#endif /* not HP-UX; use dlsym()/dlerror() */
}
-const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t
buflen)
+APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buffer,
apr_size_t buflen)
{
if (dso->errormsg) {
apr_cpystrn(buffer, dso->errormsg, buflen);
1.15 +5 -5 apr/dso/win32/dso.c
Index: dso.c
===================================================================
RCS file: /home/cvs/apr/dso/win32/dso.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dso.c 2000/11/11 03:23:11 1.14
+++ dso.c 2001/01/12 04:50:31 1.15
@@ -59,8 +59,8 @@
#if APR_HAS_DSO
-apr_status_t apr_dso_load(struct apr_dso_handle_t **res_handle, const char
*path,
- apr_pool_t *ctx)
+APR_DECLARE(apr_status_t) apr_dso_load(struct apr_dso_handle_t **res_handle,
+ const char *path, apr_pool_t *ctx)
{
HINSTANCE os_handle;
UINT em;
@@ -114,7 +114,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_unload(struct apr_dso_handle_t *handle)
+APR_DECLARE(apr_status_t) apr_dso_unload(struct apr_dso_handle_t *handle)
{
if (!FreeLibrary(handle->handle)) {
return apr_get_os_error();
@@ -122,7 +122,7 @@
return APR_SUCCESS;
}
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym,
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
struct apr_dso_handle_t *handle,
const char *symname)
{
@@ -136,7 +136,7 @@
return APR_SUCCESS;
}
-const char *apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t
bufsize)
+APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buf,
apr_size_t bufsize)
{
return apr_strerror(dso->load_error, buf, bufsize);
}
1.26 +8 -6 apr/include/apr_dso.h
Index: apr_dso.h
===================================================================
RCS file: /home/cvs/apr/include/apr_dso.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apr_dso.h 2000/12/04 05:40:25 1.25
+++ apr_dso.h 2001/01/12 04:50:31 1.26
@@ -87,14 +87,14 @@
* @param path Path to the DSO library
* @param ctx Pool to use.
*/
-apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
- apr_pool_t *ctx);
+APR_DECLARE(apr_status_t) apr_dso_load(apr_dso_handle_t **res_handle,
+ const char *path, apr_pool_t *ctx);
/**
* Close a DSO library.
* @param handle handle to close.
*/
-apr_status_t apr_dso_unload(apr_dso_handle_t *handle);
+APR_DECLARE(apr_status_t) apr_dso_unload(apr_dso_handle_t *handle);
/**
* Load a symbol from a DSO handle.
@@ -102,16 +102,18 @@
* @param handle handle to load the symbol from.
* @param symname Name of the symbol to load.
*/
-apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, apr_dso_handle_t
*handle,
- const char *symname);
+APR_DECLARE(apr_status_t) apr_dso_sym(apr_dso_handle_sym_t *ressym,
+ apr_dso_handle_t *handle,
+ const char *symname);
/**
* Report more information when a DSO function fails.
* @param dso The dso handle that has been opened
* @param buf Location to store the dso error
* @param bufsize The size of the provided buffer
+ * @deffunc const char *apr_dso_error(apr_dso_handle_t *dso, char *buf,
apr_size_t bufsize)
*/
-const char *apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t
bufsize);
+APR_DECLARE(const char *) apr_dso_error(apr_dso_handle_t *dso, char *buf,
apr_size_t bufsize);
#endif /* APR_HAS_DSO */
