First patch to re-order function parameters. This one gets the low hanging

fruit, and moves most of the result parameters to the first argument.
Future patches in this series will move the rest of the result parameters
to the beginning of the list, and will move the context's to the end of the
list


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

4 files changed, 10 insertions, 10 deletions

diff --git a/time/os2/time.c b/time/os2/time.c
index 2b0e7a2a1..3db9e66c4 100644
--- a/time/os2/time.c
+++ b/time/os2/time.c
@@ -61,7 +61,7 @@
 #include <errno.h>
 #include <string.h>
 
-ap_status_t ap_make_time(ap_context_t *cont, struct atime_t **new)
+ap_status_t ap_make_time(struct atime_t **new, ap_context_t *cont)
 {
     (*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
 
diff --git a/time/unix/access.c b/time/unix/access.c
index 12dbc9637..6a627ce0a 100644
--- a/time/unix/access.c
+++ b/time/unix/access.c
@@ -343,7 +343,7 @@ ap_status_t ap_set_wday(struct atime_t *atime, ap_int32_t value)
 ap_status_t ap_get_timedata(struct atime_t *atime, char *key, void *data)
 {
     if (atime != NULL) {
-        return ap_get_userdata(atime->cntxt, key, &data);
+        return ap_get_userdata(&data, atime->cntxt, key);
     }
     else {
         data = NULL;
diff --git a/time/unix/time.c b/time/unix/time.c
index 5ad6c36a8..f0a797a34 100644
--- a/time/unix/time.c
+++ b/time/unix/time.c
@@ -68,7 +68,7 @@
  * arg 1) The context to operate on.
  * arg 2) The new time entity to create.
  */
-ap_status_t ap_make_time(ap_context_t *cont, struct atime_t **new)
+ap_status_t ap_make_time(struct atime_t **new, ap_context_t *cont)
 {
     (*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
 
@@ -162,12 +162,12 @@ ap_status_t ap_implode_time(struct atime_t *atime)
 }
 
 /* ***APRDOC********************************************************
- * ap_status_t ap_get_os_time(ap_time_t *, ap_os_time_t **)
+ * ap_status_t ap_get_os_time(ap_os_time_t **, ap_time_t *)
  *    Convert from apr time type to OS specific time value
  * arg 1) The time value to convert.
  * arg 2) The OS specific value to convert to.
  */
-ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t **atime)
+ap_status_t ap_get_os_time(ap_os_time_t **atime, struct atime_t *thetime)
 {
     if (thetime == NULL) {
         return APR_ENOTIME;
@@ -180,14 +180,14 @@ ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t **atime)
 }
 
 /* ***APRDOC********************************************************
- * ap_status_t ap_put_os_time(ap_context_t *, ap_time_t **, ap_os_time_t *)
+ * ap_status_t ap_put_os_time(ap_time_t **, ap_os_time_t *, ap_context_t *)
  *    Convert to apr time type from OS specific time value
  * arg 1) The context to use.
  * arg 2) The time value to convert to.
  * arg 3) The OS specific value to convert.
  */
-ap_status_t ap_put_os_time(ap_context_t *cont, struct atime_t **thetime, 
-                           ap_os_time_t *atime)
+ap_status_t ap_put_os_time(struct atime_t **thetime, ap_os_time_t *atime, 
+                           ap_context_t *cont)
 {
     if (cont == NULL) {
         return APR_ENOCONT;
diff --git a/time/win32/time.c b/time/win32/time.c
index b61a547f9..8eba99897 100644
--- a/time/win32/time.c
+++ b/time/win32/time.c
@@ -62,7 +62,7 @@
 #include <errno.h>
 #include <string.h>
 
-ap_status_t ap_make_time(ap_context_t *cont, struct atime_t **new)
+ap_status_t ap_make_time(struct atime_t **new, ap_context_t *cont)
 {
     (*new) = (struct atime_t *)ap_palloc(cont, sizeof(struct atime_t));
 
@@ -111,7 +111,7 @@ ap_status_t ap_implode_time(struct atime_t *atime)
     return APR_SUCCESS;
 }
 
-ap_status_t ap_get_os_time(struct atime_t *thetime, ap_os_time_t **atime)
+ap_status_t ap_get_os_time(ap_os_time_t **atime, struct atime_t *thetime)
 {
     if (thetime == NULL) {
         return APR_ENOTIME;