prefix libapr functions and types with apr_

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60470 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 52 insertions, 52 deletions

diff --git a/dso/aix/dso.c b/dso/aix/dso.c
index 9c92aa04d..5e10b4ce2 100644
--- a/dso/aix/dso.c
+++ b/dso/aix/dso.c
@@ -132,21 +132,21 @@ struct dl_info {
  * add the basic "wrappers" here.
  */
 
-ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, 
-                        ap_pool_t *ctx)
+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);
 
     if(os_handle == NULL)
         return APR_EDSOOPEN;
 
-    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
     (*res_handle)->handle = (void*)os_handle;
     (*res_handle)->cont = ctx;
     return APR_SUCCESS;
 }
 
-ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
+apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
 {
     if (dlclose(handle->handle) != 0)
         return APR_EINIT;
@@ -154,8 +154,8 @@ ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
-                       ap_dso_handle_t *handle, 
+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);
diff --git a/dso/aix/dso.h b/dso/aix/dso.h
index ae89f9ee5..6b7ca8ea7 100644
--- a/dso/aix/dso.h
+++ b/dso/aix/dso.h
@@ -68,8 +68,8 @@ void *dlsym(void *handle, const char *symbol);
 const char *dlerror(void);
 int dlclose(void *handle);
 
-struct ap_dso_handle_t {
-    ap_pool_t  *cont;
+struct apr_dso_handle_t {
+    apr_pool_t  *cont;
     void          *handle;
 };
 
diff --git a/dso/beos/dso.c b/dso/beos/dso.c
index c6ed29f1f..6a29f1efc 100644
--- a/dso/beos/dso.c
+++ b/dso/beos/dso.c
@@ -56,21 +56,21 @@
 
 #if APR_HAS_DSO
 
-ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
-              ap_pool_t *ctx)
+apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path,
+              apr_pool_t *ctx)
 {
     image_id newid;
 
     if((newid = load_add_on(path)) < B_NO_ERROR)
         return APR_EINIT;
 
-    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
     (*res_handle)->handle = newid;
     (*res_handle)->cont = ctx;
     return APR_SUCCESS;
 }
 
-ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
+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 @@ ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, ap_dso_handle_t *handle,
+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 @@ ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, ap_dso_handle_t *handle,
     return APR_SUCCESS;
 }
 
-const char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
+const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
 {
     strncpy(strerror(errno), buffer, buflen);
     return buffer;
diff --git a/dso/beos/dso.h b/dso/beos/dso.h
index 71a75ef58..476e71c8f 100644
--- a/dso/beos/dso.h
+++ b/dso/beos/dso.h
@@ -66,9 +66,9 @@
 
 #if APR_HAS_DSO
 
-struct ap_dso_handle_t {
+struct apr_dso_handle_t {
     image_id       handle;    /* Handle to the DSO loaded */
-    ap_pool_t   *cont;
+    apr_pool_t   *cont;
 };
 
 #endif
diff --git a/dso/os2/dso.c b/dso/os2/dso.c
index 5bd913b2e..d7706f138 100644
--- a/dso/os2/dso.c
+++ b/dso/os2/dso.c
@@ -60,38 +60,38 @@
 
 #if APR_HAS_DSO
 
-static ap_status_t dso_cleanup(void *thedso)
+static apr_status_t dso_cleanup(void *thedso)
 {
-    ap_dso_handle_t *dso = thedso;
-    return ap_dso_unload(dso);
+    apr_dso_handle_t *dso = thedso;
+    return apr_dso_unload(dso);
 }
 
 
-ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_pool_t *ctx)
+apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx)
 {
     char failed_module[20];
     HMODULE handle;
     int rc;
 
-    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
     (*res_handle)->cont = ctx;
     (*res_handle)->load_error = APR_SUCCESS;
     (*res_handle)->failed_module = NULL;
 
     if ((rc = DosLoadModule(failed_module, sizeof(failed_module), path, &handle)) != 0) {
         (*res_handle)->load_error = APR_OS2_STATUS(rc);
-        (*res_handle)->failed_module = ap_pstrdup(ctx, failed_module);
+        (*res_handle)->failed_module = apr_pstrdup(ctx, failed_module);
         return APR_OS2_STATUS(rc);
     }
 
     (*res_handle)->handle  = handle;
-    ap_register_cleanup(ctx, *res_handle, dso_cleanup, ap_null_cleanup);
+    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
     return APR_SUCCESS;
 }
 
 
 
-ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
+apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
 {
     int rc;
 
@@ -108,8 +108,8 @@ ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
 
 
 
-ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
-                       ap_dso_handle_t *handle, 
+apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
+                       apr_dso_handle_t *handle, 
                        const char *symname)
 {
     PFN func;
@@ -127,14 +127,14 @@ ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym,
 
 
 
-char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
+char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
 {
     char message[200];
-    ap_strerror(dso->load_error, message, sizeof(message));
+    apr_strerror(dso->load_error, message, sizeof(message));
     strcat(message, " (");
     strcat(message, dso->failed_module);
     strcat(message, ")");
-    ap_cpystrn(buffer, message, buflen);
+    apr_cpystrn(buffer, message, buflen);
     return buffer;
 }
 
diff --git a/dso/os2/dso.h b/dso/os2/dso.h
index b37e1a54c..1597c81d1 100644
--- a/dso/os2/dso.h
+++ b/dso/os2/dso.h
@@ -66,10 +66,10 @@
 
 #if APR_HAS_DSO
 
-struct ap_dso_handle_t {
-    ap_pool_t  *cont;       /* Context for returning error strings */
+struct apr_dso_handle_t {
+    apr_pool_t  *cont;       /* Context for returning error strings */
     HMODULE       handle;     /* Handle to the DSO loaded            */
-    ap_status_t   load_error;
+    apr_status_t   load_error;
     char          *failed_module;
 };
 
diff --git a/dso/unix/dso.c b/dso/unix/dso.c
index c3e815fa6..9a6a0e0fb 100644
--- a/dso/unix/dso.c
+++ b/dso/unix/dso.c
@@ -56,8 +56,8 @@
 
 #if APR_HAS_DSO
 
-ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, 
-                        ap_pool_t *ctx)
+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);
@@ -68,7 +68,7 @@ ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
     void *os_handle = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
 #endif    
 
-    *res_handle = ap_pcalloc(ctx, sizeof(**res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(**res_handle));
 
     if(os_handle == NULL) {
 #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
@@ -86,7 +86,7 @@ ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path,
     return APR_SUCCESS;
 }
     
-ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
+apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
 {
 #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
     shl_unload((shl_t)handle->handle);
@@ -99,8 +99,8 @@ ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
-                       ap_dso_handle_t *handle, 
+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)
@@ -141,7 +141,7 @@ ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym,
 #endif /* not HP-UX; use dlsym()/dlerror() */
 }
 
-const char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
+const char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
 {
     if (dso->errormsg)
         return dso->errormsg;
diff --git a/dso/unix/dso.h b/dso/unix/dso.h
index ef8aa572a..fc9b8325e 100644
--- a/dso/unix/dso.h
+++ b/dso/unix/dso.h
@@ -85,8 +85,8 @@
 #define DLSYM_NEEDS_UNDERSCORE
 #endif
 
-struct ap_dso_handle_t {
-    ap_pool_t  *cont;
+struct apr_dso_handle_t {
+    apr_pool_t  *cont;
     void          *handle;
     const char *errormsg;
 };
diff --git a/dso/win32/dso.c b/dso/win32/dso.c
index fadde87b9..732e86fc9 100644
--- a/dso/win32/dso.c
+++ b/dso/win32/dso.c
@@ -56,11 +56,11 @@
 
 #if APR_HAS_DSO
 
-ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, 
-                        ap_pool_t *ctx)
+apr_status_t apr_dso_load(struct apr_dso_handle_t **res_handle, const char *path, 
+                        apr_pool_t *ctx)
 {
     HINSTANCE os_handle = LoadLibraryEx(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
-    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
 
     if(os_handle == NULL) {
         (*res_handle)->load_error = GetLastError();
@@ -73,7 +73,7 @@ ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path,
     return APR_SUCCESS;
 }
     
-ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
+apr_status_t apr_dso_unload(struct apr_dso_handle_t *handle)
 {
     if (!FreeLibrary(handle->handle)) {
         return GetLastError();
@@ -81,8 +81,8 @@ ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
-                       struct ap_dso_handle_t *handle, 
+apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
+                       struct apr_dso_handle_t *handle, 
                        const char *symname)
 {
     FARPROC retval = GetProcAddress(handle->handle, symname);
@@ -95,9 +95,9 @@ ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym,
     return APR_SUCCESS;
 }
 
-const char *ap_dso_error(ap_dso_handle_t *dso, char *buf, ap_size_t bufsize)
+const char *apr_dso_error(apr_dso_handle_t *dso, char *buf, apr_size_t bufsize)
 {
-    return ap_strerror(dso->load_error, buf, bufsize);
+    return apr_strerror(dso->load_error, buf, bufsize);
 }
 
 #endif
diff --git a/dso/win32/dso.h b/dso/win32/dso.h
index 73ab8b1ed..32bf6b7be 100644
--- a/dso/win32/dso.h
+++ b/dso/win32/dso.h
@@ -63,10 +63,10 @@
 
 #if APR_HAS_DSO
 
-struct ap_dso_handle_t {
-    ap_pool_t  *cont;
+struct apr_dso_handle_t {
+    apr_pool_t  *cont;
     void          *handle;
-    ap_status_t   load_error;
+    apr_status_t   load_error;
 };
 
 #endif