From: Ryan Bloom <rbb@apache.org>
Date: Mon, 11 Oct 1999 17:52:28 +0000 (+0000)
Subject: This finishes the argument swaps.  The docs haven't been updated, and
X-Git-Tag: 1.3.10~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25c184d3e7ef6d5d3073fa8bbfceffd4195e2323;p=thirdparty%2Fapache%2Fhttpd.git

This finishes the argument swaps.  The docs haven't been updated, and
probably won't be for a while yet.  These argument orders have been
documented in the APR Design doc committed earlier today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83963 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/log.c b/server/log.c
index 28a2268d7fd..72eeb7cfd38 100644
--- a/server/log.c
+++ b/server/log.c
@@ -187,7 +187,7 @@ static int log_child(ap_context_t *p, const char *progname,
         rc = -1;
     }
     else {
-        rc = ap_create_process(&procnew, p, progname, NULL, NULL, procattr);
+        rc = ap_create_process(&procnew, progname, NULL, NULL, procattr, p);
     
         if (rc == APR_SUCCESS) {
 #ifndef WIN32
@@ -195,7 +195,7 @@ static int log_child(ap_context_t *p, const char *progname,
              *       stages. ap_note_subprocess and free_proc need to be redone
              *       to make use of ap_proc_t instead of pid.
              */
-            ap_get_os_proc(procnew, &fred);
+            ap_get_os_proc(&fred, procnew);
             ap_note_subprocess(p, fred, kill_after_timeout);
 #endif
             if (fpin) {
@@ -638,13 +638,13 @@ static int piped_log_spawn(piped_log *pl)
         rc = -1;
     }
     else {
-        rc = ap_create_process(pl->p, pl->program, NULL, NULL, procattr, &procnew);
+        rc = ap_create_process(&procnew, pl->program, NULL, NULL, procattr, pl->p);
     
         if (rc == APR_SUCCESS) {            /* pjr - This no longer happens inside the child, */
             RAISE_SIGSTOP(PIPED_LOG_SPAWN); /*   I am assuming that if ap_create_process was  */
                                             /*   successful that the child is running.        */
             pl->pid = procnew;
-            ap_get_os_proc(&procnew, &pid);
+            ap_get_os_proc(&pid, &procnew);
             ap_register_other_child(pid, piped_log_maintenance, pl, pl->fds[1]);
         }
     }