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, 11 insertions, 11 deletions

diff --git a/misc/beos/start.c b/misc/beos/start.c
index 8b036eefd..8dcecf083 100644
--- a/misc/beos/start.c
+++ b/misc/beos/start.c
@@ -63,7 +63,7 @@
 #include <errno.h>
 #include <string.h>
 
-ap_status_t ap_create_context(ap_context_t *cont, void *data, ap_context_t **newcont)
+ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont, void *data)
 {
     ap_context_t *new;
     ap_pool_t *pool;
@@ -113,7 +113,7 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data)
     return APR_ENOCONT;
 }
 
-ap_status_t ap_get_userdata(struct context_t *cont, void **data)
+ap_status_t ap_get_userdata(void **data, struct context_t *cont)
 {
     if (cont) { 
         (*data) = cont->prog_data;
diff --git a/misc/os2/start.c b/misc/os2/start.c
index 00ad1f9a5..ad980bcaa 100644
--- a/misc/os2/start.c
+++ b/misc/os2/start.c
@@ -60,7 +60,7 @@
 #include <errno.h>
 #include <string.h>
 
-ap_status_t ap_create_context(struct context_t *cont, void *data, ap_context_t **newcont)
+ap_status_t ap_create_context(ap_context_t **newcont, struct context_t *cont, void *data)
 {
     struct context_t *new;
     ap_pool_t *pool;
@@ -117,12 +117,12 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data)
 }
 
 /* ***APRDOC********************************************************
- * ap_status_t ap_get_userdata(ap_context_t *, void **)
+ * ap_status_t ap_get_userdata(void **, ap_context_t *)
  *    Return the data associated with the current context.
  * arg 1) The current context.
  * arg 2) The user data associated with the context.
  */
-ap_status_t ap_get_userdata(struct context_t *cont, void **data)
+ap_status_t ap_get_userdata(void **data, struct context_t *cont)
 {
     if (cont) {
         (*data) = cont->prog_data;
diff --git a/misc/unix/start.c b/misc/unix/start.c
index f431823f2..21f9143b4 100644
--- a/misc/unix/start.c
+++ b/misc/unix/start.c
@@ -66,7 +66,7 @@
 #endif
 
 /* ***APRDOC********************************************************
- * ap_status_t ap_create_context(ap_context_t *, ap_context_t **)
+ * ap_status_t ap_create_context(ap_context_t **, ap_context_t *)
  *    Create a new context.
  * arg 1) The parent context.  If this is NULL, the new context is a root
  *        context.  If it is non-NULL, the new context will inherit all
@@ -74,7 +74,7 @@
  *        sub-pool.
  * arg 2) The context we have just created.
  */
-ap_status_t ap_create_context(struct context_t *cont, struct context_t **newcont)
+ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont)
 {
     struct context_t *new;
     ap_pool_t *pool;
@@ -164,13 +164,13 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key,
 }
 
 /* ***APRDOC********************************************************
- * ap_status_t ap_get_userdata(ap_context_t *, void **)
+ * ap_status_t ap_get_userdata(void **, ap_context_t *)
  *    Return the data associated with the current context.
  * arg 1) The current context.
  * arg 2) The key for the data to retrieve
  * arg 3) The user data associated with the context.
  */
-ap_status_t ap_get_userdata(struct context_t *cont, char *key, void **data)
+ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
 {
     datastruct *dptr = NULL;
     if (cont) { 
diff --git a/misc/win32/start.c b/misc/win32/start.c
index 4a6a44a3d..d12adc0bb 100644
--- a/misc/win32/start.c
+++ b/misc/win32/start.c
@@ -69,7 +69,7 @@ ap_status_t clean_cont(void *data)
 }
     
 
-ap_status_t ap_create_context(ap_context_t *cont, ap_context_t **newcont)
+ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont)
 {
     int iVersionRequested;
     WSADATA wsaData;
@@ -177,7 +177,7 @@ ap_status_t ap_set_userdata(struct context_t *cont, void *data, char *key,
     return APR_ENOCONT;
 }
 
-ap_status_t ap_get_userdata(struct context_t *cont, char *key, void **data)
+ap_status_t ap_get_userdata(void **data, struct context_t *cont, char *key)
 {
     datastruct *dptr = NULL;
     if (cont) {