renaming various functions for consistency sake

see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


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

1 files changed, 6 insertions, 6 deletions

diff --git a/test/testpipe.c b/test/testpipe.c
index c3657a10c..4a6a8cfc1 100644
--- a/test/testpipe.c
+++ b/test/testpipe.c
@@ -82,7 +82,7 @@ int main(void)
         exit(-1);
     }
     atexit(closeapr);
-    if (apr_create_pool(&context, NULL) != APR_SUCCESS) {
+    if (apr_pool_create(&context, NULL) != APR_SUCCESS) {
         fprintf(stderr, "Couldn't allocate context.");
         exit(-1);
     }
@@ -90,8 +90,8 @@ int main(void)
     fprintf(stdout, "Testing pipe functions.\n");
 
     fprintf(stdout, "\tCreating pipes.......");
-    if ((rv = apr_create_pipe(&readp, &writep, context)) != APR_SUCCESS) {
-        fprintf(stderr, "apr_create_pipe()->%d/%s\n",
+    if ((rv = apr_file_pipe_create(&readp, &writep, context)) != APR_SUCCESS) {
+        fprintf(stderr, "apr_file_pipe_create()->%d/%s\n",
                 rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
         exit(-1);
     }
@@ -100,8 +100,8 @@ int main(void)
     }
     
     fprintf(stdout, "\tSetting pipe timeout.......");
-    if ((rv = apr_set_pipe_timeout(readp, 1 * APR_USEC_PER_SEC)) != APR_SUCCESS) {
-        fprintf(stderr, "apr_set_pipe_timeout()->%d/%s\n",
+    if ((rv = apr_file_pipe_timeout_set(readp, 1 * APR_USEC_PER_SEC)) != APR_SUCCESS) {
+        fprintf(stderr, "apr_file_pipe_timeout_set()->%d/%s\n",
                 rv, apr_strerror(rv, msgbuf, sizeof msgbuf));
         exit(-1);
     } else {
@@ -111,7 +111,7 @@ int main(void)
     fprintf(stdout, "\tReading from the pipe.......");
     nbytes = strlen("this is a test");
     buf = (char *)apr_palloc(context, nbytes + 1);
-    if (apr_read(readp, buf, &nbytes) == APR_TIMEUP) {
+    if (apr_file_read(readp, buf, &nbytes) == APR_TIMEUP) {
         fprintf(stdout, "OK\n");
     }
     else {