Move some prototypes from apr_lib.h to apr_strings.h.

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

2 files changed, 32 insertions, 31 deletions

diff --git a/include/apr_lib.h b/include/apr_lib.h
index e52c81e5c..2b5ef99d9 100644
--- a/include/apr_lib.h
+++ b/include/apr_lib.h
@@ -89,22 +89,6 @@ typedef struct ap_vformatter_buff_t {
 
 /*
 
-=head1 ap_status_t ap_tokenize_to_argv(const char **arg_str, char ***argv_out, ap_pool_t *token_context)
-
-B<Convert the arguments to a program from one string to an array of strings terminated by a NULL>
-
-    arg 1) The arguments to convert
-    arg 2) Output location.  This is a pointer to an array of strings.
-    arg 3) Pool to use.
-
-=cut
- */
-APR_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str, 
-                                            char ***argv_out,
-                                            ap_pool_t *token_context);
-
-/*
-
 =head1 ap_status_t ap_filename_of_pathname(const char *pathname)
 
 B<return the final element of the pathname>
@@ -120,21 +104,6 @@ B<NOTE>:  Examples:  "/foo/bar/gum"   -> "gum"
  */
 APR_EXPORT(const char *) ap_filename_of_pathname(const char *pathname);
 
-
-/*
-
-=head1 ap_status_t ap_collapse_spaces(char *dest, const char *src)
-
-B<Strip spaces from a string>
-
-    arg 1) The destination string.  It is okay to modify the string
-           in place.  Namely dest == src
-    arg 2) The string to rid the spaces from.
-
-=cut
- */
-APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src);
-
 /*
 
 =head1 ap_status_t ap_execle(const char *c, const char *a, ...)
diff --git a/include/apr_strings.h b/include/apr_strings.h
index b241e5a8d..2d1816485 100644
--- a/include/apr_strings.h
+++ b/include/apr_strings.h
@@ -157,6 +157,38 @@ B<NOTE>:  We re-implement this function to implement these specific changes:
  */
 APR_EXPORT(char *) ap_cpystrn(char *dst, const char *src, size_t dst_size);
 
+/*
+
+=head1 ap_status_t ap_collapse_spaces(char *dest, const char *src)
+
+B<Strip spaces from a string>
+
+    arg 1) The destination string.  It is okay to modify the string
+           in place.  Namely dest == src
+    arg 2) The string to rid the spaces from.
+
+=cut
+ */
+APR_EXPORT(char *) ap_collapse_spaces(char *dest, const char *src);
+
+/*
+
+=head1 ap_status_t ap_tokenize_to_argv(const char **arg_str, char ***argv_out, a
+p_pool_t *token_context)
+
+B<Convert the arguments to a program from one string to an array of strings term
+inated by a NULL>
+
+    arg 1) The arguments to convert
+    arg 2) Output location.  This is a pointer to an array of strings.
+    arg 3) Pool to use.
+
+=cut
+ */
+APR_EXPORT(ap_status_t) ap_tokenize_to_argv(const char *arg_str,
+                                            char ***argv_out,
+                                            ap_pool_t *token_context);
+
 #ifdef __cplusplus
 }
 #endif