You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2012/03/21 16:18:28 UTC
svn commit: r1303435 - /httpd/httpd/trunk/server/mpm_unix.c
Author: rpluem
Date: Wed Mar 21 15:18:28 2012
New Revision: 1303435
URL: http://svn.apache.org/viewvc?rev=1303435&view=rev
Log:
* Fix changes in parameter names in function definitions done in r1303201
Modified:
httpd/httpd/trunk/server/mpm_unix.c
Modified: httpd/httpd/trunk/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.c?rev=1303435&r1=1303434&r2=1303435&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.c (original)
+++ httpd/httpd/trunk/server/mpm_unix.c Wed Mar 21 15:18:28 2012
@@ -100,7 +100,7 @@ AP_DECLARE(int) ap_unregister_extra_mpm_
else {
extras = cur->next;
}
- *gen = cur->gen;
+ *old_gen = cur->gen;
free(cur);
return 1; /* found */
}
@@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
#endif /* NO_USE_SIGACTION */
- pconf = in_pconf;
+ pconf = pconf;
parent_pid = my_pid = getpid();
return APR_SUCCESS;
RE: svn commit: r1303435 - /httpd/httpd/trunk/server/mpm_unix.c
Posted by Plüm,
Rüdiger,
Vodafone Group <ru...@vodafone.com>.
> > >> > @@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
> > >> >
> > >> > #endif /* NO_USE_SIGACTION */
> > >> >
> > >> > - pconf = in_pconf;
> > >> > + pconf = pconf;
> > >> > parent_pid = my_pid = getpid();
> > >>
> > >> Doesn't the parameter name need to be changed back?
> > >
> > > IMHO not. The definition was synced with what we had in the header
> > file.
> > > Although this is not required from compiler perspective I prefer
> > header and c file
> > > in sync on the parameter names as well.
> >
> > Isn't the global pconf shadowed by the changed parameter name, or
> does
> > this assignment really do something?
>
>
> AH. Now I see what you mean. Yeah, that should be fixed. So in_pconf
> everywhere
> (header file, function definition in c file, function body).
> I am busy today, so if you like feel free to adjust.
>
Found some time. Fixed in r1303827.
Regards
Rüdiger
RE: svn commit: r1303435 - /httpd/httpd/trunk/server/mpm_unix.c
Posted by Plüm,
Rüdiger,
Vodafone Group <ru...@vodafone.com>.
> -----Original Message-----
> From: Eric Covener
> Sent: Donnerstag, 22. März 2012 13:00
> To: dev@httpd.apache.org
> Subject: Re: svn commit: r1303435 -
> /httpd/httpd/trunk/server/mpm_unix.c
>
> On Thu, Mar 22, 2012 at 3:49 AM, Plüm, Rüdiger, Vodafone Group
> <ru...@vodafone.com> wrote:
> >
> >
> >> -----Original Message-----
> >> From: Eric Covener
> >> Sent: Mittwoch, 21. März 2012 18:58
> >> To: dev@httpd.apache.org
> >> Subject: Re: svn commit: r1303435 -
> >> /httpd/httpd/trunk/server/mpm_unix.c
> >>
> >> > @@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
> >> >
> >> > #endif /* NO_USE_SIGACTION */
> >> >
> >> > - pconf = in_pconf;
> >> > + pconf = pconf;
> >> > parent_pid = my_pid = getpid();
> >>
> >> Doesn't the parameter name need to be changed back?
> >
> > IMHO not. The definition was synced with what we had in the header
> file.
> > Although this is not required from compiler perspective I prefer
> header and c file
> > in sync on the parameter names as well.
>
> Isn't the global pconf shadowed by the changed parameter name, or does
> this assignment really do something?
AH. Now I see what you mean. Yeah, that should be fixed. So in_pconf everywhere
(header file, function definition in c file, function body).
I am busy today, so if you like feel free to adjust.
Regards
Rüdiger
Re: svn commit: r1303435 - /httpd/httpd/trunk/server/mpm_unix.c
Posted by Eric Covener <co...@gmail.com>.
On Thu, Mar 22, 2012 at 3:49 AM, Plüm, Rüdiger, Vodafone Group
<ru...@vodafone.com> wrote:
>
>
>> -----Original Message-----
>> From: Eric Covener
>> Sent: Mittwoch, 21. März 2012 18:58
>> To: dev@httpd.apache.org
>> Subject: Re: svn commit: r1303435 -
>> /httpd/httpd/trunk/server/mpm_unix.c
>>
>> > @@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
>> >
>> > #endif /* NO_USE_SIGACTION */
>> >
>> > - pconf = in_pconf;
>> > + pconf = pconf;
>> > parent_pid = my_pid = getpid();
>>
>> Doesn't the parameter name need to be changed back?
>
> IMHO not. The definition was synced with what we had in the header file.
> Although this is not required from compiler perspective I prefer header and c file
> in sync on the parameter names as well.
Isn't the global pconf shadowed by the changed parameter name, or does
this assignment really do something?
RE: svn commit: r1303435 - /httpd/httpd/trunk/server/mpm_unix.c
Posted by Plüm,
Rüdiger,
Vodafone Group <ru...@vodafone.com>.
> -----Original Message-----
> From: Eric Covener
> Sent: Mittwoch, 21. März 2012 18:58
> To: dev@httpd.apache.org
> Subject: Re: svn commit: r1303435 -
> /httpd/httpd/trunk/server/mpm_unix.c
>
> > @@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
> >
> > #endif /* NO_USE_SIGACTION */
> >
> > - pconf = in_pconf;
> > + pconf = pconf;
> > parent_pid = my_pid = getpid();
>
> Doesn't the parameter name need to be changed back?
IMHO not. The definition was synced with what we had in the header file.
Although this is not required from compiler perspective I prefer header and c file
in sync on the parameter names as well.
Regards
Rüdiger
Re: svn commit: r1303435 - /httpd/httpd/trunk/server/mpm_unix.c
Posted by Eric Covener <co...@gmail.com>.
> @@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
>
> #endif /* NO_USE_SIGACTION */
>
> - pconf = in_pconf;
> + pconf = pconf;
> parent_pid = my_pid = getpid();
Doesn't the parameter name need to be changed back?