You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2007/12/19 04:02:57 UTC
svn commit: r605396 - /httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Author: wrowe
Date: Tue Dec 18 19:02:57 2007
New Revision: 605396
URL: http://svn.apache.org/viewvc?rev=605396&view=rev
Log:
Handle args appropriately for an apr app.
Backports r605395
Modified:
httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Modified: httpd/httpd/branches/2.2.x/support/httxt2dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/httxt2dbm.c?rev=605396&r1=605395&r2=605396&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/httxt2dbm.c (original)
+++ httpd/httpd/branches/2.2.x/support/httxt2dbm.c Tue Dec 18 19:02:57 2007
@@ -173,7 +173,7 @@
return rv;
}
-int main(int argc, const char *const argv[])
+int main(int argc, const char * const argv[])
{
apr_pool_t *pool;
apr_status_t rv = APR_SUCCESS;
@@ -183,7 +183,7 @@
apr_file_t *infile;
apr_dbm_t *outdbm;
- apr_initialize();
+ apr_app_initialize(&argc, &argv, NULL);
atexit(apr_terminate);
verbose = 0;
Re: svn commit: r605396 -
/httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Posted by Guenter Knauf <fu...@apache.org>.
Hi,
> Speaking of 3+1's
> William A. Rowe, Jr. wrote:
>>
>> If anyone objects to
>>
>> @ -183,7 +183,7 @@
>> apr_file_t *infile;
>> apr_dbm_t *outdbm;
>>
>> - apr_initialize();
>> + apr_app_initialize(&argc, &argv, NULL);
>> atexit(apr_terminate);
>>
>> verbose = 0;
>>
> There's no 2.0.x of this file, but if someone would add a third +1
> (Rudiger blessed this on the 21st) for this 2.2.x backport, that
> would be nice, and consistent with our policy. (That other crufty
> whitespace change was already backed out.)
+1 without having tested, but from what I see all other ht* support tools use apr_app_initialize() too, so this seems right to me.
Guen.
Re: svn commit: r605396 - /httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Speaking of 3+1's
William A. Rowe, Jr. wrote:
>
> If anyone objects to
>
> @ -183,7 +183,7 @@
> apr_file_t *infile;
> apr_dbm_t *outdbm;
>
> - apr_initialize();
> + apr_app_initialize(&argc, &argv, NULL);
> atexit(apr_terminate);
>
> verbose = 0;
>
> I'm happy to revert the whole thing. Sorry for treating this as
> a platform patch issue; it does touch other platforms.
There's no 2.0.x of this file, but if someone would add a third +1
(Rudiger blessed this on the 21st) for this 2.2.x backport, that
would be nice, and consistent with our policy. (That other crufty
whitespace change was already backed out.)
Bill
Re: svn commit: r605396 - /httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Posted by Plüm,
Rüdiger,
VF-Group <ru...@vodafone.com>.
> -----Ursprüngliche Nachricht-----
> Von: William A. Rowe, Jr.
> Gesendet: Freitag, 21. Dezember 2007 00:06
> An: dev@httpd.apache.org
> Betreff: Re: svn commit: r605396 -
> /httpd/httpd/branches/2.2.x/support/httxt2dbm.c
>
>
> Ruediger Pluem wrote:
> >
> > On 12/19/2007 04:02 AM, wrowe@apache.org wrote:
> >> Author: wrowe
> >> Date: Tue Dec 18 19:02:57 2007
> >> New Revision: 605396
> >>
> >> URL: http://svn.apache.org/viewvc?rev=605396&view=rev
>
> > Sorry for nitpicking, but
> >
> > 1. Where is the vote on this backport?
>
> I'm happy to revert if that's desired. I'm also happy to pull
> httxt2dbm from the win32 targets list. I choose the obvious one,
> but sorry if it offended anyone's sensibilities; the patch simply
No hassle. I was just curious if I missed something.
> synced the apr_init semantics of httxt2dbm to the other support apps,
> allowing it to 1) compile (in an NT case) and 2) handle obtuse
> filenames (non-ascii) portably on win32 as well.
>
> If anyone objects to
>
> @ -183,7 +183,7 @@
> apr_file_t *infile;
> apr_dbm_t *outdbm;
>
> - apr_initialize();
> + apr_app_initialize(&argc, &argv, NULL);
Looks good to me. So +1 to keep it in 2.2.x.
Regards
Rüdiger
Re: svn commit: r605396 - /httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Ruediger Pluem wrote:
>
> On 12/19/2007 04:02 AM, wrowe@apache.org wrote:
>> Author: wrowe
>> Date: Tue Dec 18 19:02:57 2007
>> New Revision: 605396
>>
>> URL: http://svn.apache.org/viewvc?rev=605396&view=rev
> Sorry for nitpicking, but
>
> 1. Where is the vote on this backport?
I'm happy to revert if that's desired. I'm also happy to pull
httxt2dbm from the win32 targets list. I choose the obvious one,
but sorry if it offended anyone's sensibilities; the patch simply
synced the apr_init semantics of httxt2dbm to the other support apps,
allowing it to 1) compile (in an NT case) and 2) handle obtuse
filenames (non-ascii) portably on win32 as well.
If anyone objects to
@ -183,7 +183,7 @@
apr_file_t *infile;
apr_dbm_t *outdbm;
- apr_initialize();
+ apr_app_initialize(&argc, &argv, NULL);
atexit(apr_terminate);
verbose = 0;
I'm happy to revert the whole thing. Sorry for treating this as
a platform patch issue; it does touch other platforms.
>> -int main(int argc, const char *const argv[])
>> +int main(int argc, const char * const argv[])
>
> 2. Trunk and 2.2.x are now different because the line in trunk is still
>
> int main(int argc, const char *const argv[])
>
> This makes backports harder for no good reason.
And was altogether wrong, that part should not have been committed,
I had backed the change out before committing trunk and should have
done so here. I'm reverting that half immediately, and will back
the other half out immediately upon request. Thanks Ruediger!
Bill
Re: svn commit: r605396 - /httpd/httpd/branches/2.2.x/support/httxt2dbm.c
Posted by Ruediger Pluem <rp...@apache.org>.
On 12/19/2007 04:02 AM, wrowe@apache.org wrote:
> Author: wrowe
> Date: Tue Dec 18 19:02:57 2007
> New Revision: 605396
>
> URL: http://svn.apache.org/viewvc?rev=605396&view=rev
> Log:
> Handle args appropriately for an apr app.
>
> Backports r605395
>
> Modified:
> httpd/httpd/branches/2.2.x/support/httxt2dbm.c
>
> Modified: httpd/httpd/branches/2.2.x/support/httxt2dbm.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/httxt2dbm.c?rev=605396&r1=605395&r2=605396&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.2.x/support/httxt2dbm.c (original)
> +++ httpd/httpd/branches/2.2.x/support/httxt2dbm.c Tue Dec 18 19:02:57 2007
> @@ -173,7 +173,7 @@
> return rv;
> }
>
> -int main(int argc, const char *const argv[])
> +int main(int argc, const char * const argv[])
Sorry for nitpicking, but
1. Where is the vote on this backport?
2. Trunk and 2.2.x are now different because the line in trunk is still
int main(int argc, const char *const argv[])
This makes backports harder for no good reason.
Regards
Rüdiger