You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@apr.apache.org by Bojan Smojver <bo...@rexursive.com> on 2008/06/13 06:12:16 UTC
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c
dbd/apr_dbd_freetds.c dbd/apr_dbd_odbc.c include/apu.h.in
On Fri, 2008-06-13 at 04:10 +0000, bojan@apache.org wrote:
> @@ -646,7 +649,7 @@
>
> if (SQL_SUCCEEDED(rc) || rc == SQL_NO_DATA) {
>
> - if (rc = SQL_SUCCESS_WITH_INFO
> + if (rc == SQL_SUCCESS_WITH_INFO
> && ( len_indicator == SQL_NO_TOTAL || len_indicator >= bufsize) ) {
> /* not the last read = a full buffer. CLOBs have a null terminator */
> *len = bufsize - (IS_CLOB(bd->type) ? 1 : 0 );
Tom, please check if the above is what you meant.
> @@ -1327,7 +1331,7 @@
> if (!(sq = strchr(s, '\'')))
> return (char *) s;
> /* count the single-quotes and allocate a new buffer */
> - for (qcount = 1; sq = strchr(sq + 1, '\''); )
> + for (qcount = 1; (sq = strchr(sq + 1, '\'')); )
> qcount++;
> newstr = apr_palloc(pool, strlen(s) + qcount + 1);
>
Ditto.
--
Bojan
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c dbd/apr_dbd_freetds.c
dbd/apr_dbd_odbc.c include/apu.h.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Bojan Smojver wrote:
> On Fri, 2008-06-13 at 00:32 -0400, Tom Donovan wrote:
>
>> The second one doesn't change the behavior, just cleaning up -Wall
>> warnings, right?
>
> That's right. Thanks for reviewing.
>
> If nobody objects, I'm going to backport ODBC driver to 1.3.x then.
Hold off on the pdb, I'll move that shortly.
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c dbd/apr_dbd_freetds.c
dbd/apr_dbd_odbc.c include/apu.h.in
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Bojan Smojver wrote:
> On Fri, 2008-06-13 at 01:14 -0400, Tom Donovan wrote:
>
>> maybe ship it with httpd 2.2.9? Whew!
>
> Nah, you were just (un)lucky to hit the right spot :-)
:) Unfortunately, not in the 2.2.9 package, since they adopted apr 1.3.0,
but anyone will be free to grab on.
I hope we see another 2.2 with just a set of bugfixes and nothing all that
serious that can pick up 1.3.1 for dbd magic, though.
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c
dbd/apr_dbd_freetds.c dbd/apr_dbd_odbc.c include/apu.h.in
Posted by Bojan Smojver <bo...@rexursive.com>.
On Fri, 2008-06-13 at 01:14 -0400, Tom Donovan wrote:
> p.s. Man you guys move quick! My first non-trivial checkin was about 9 hours ago, and if I
> understand it all correctly - you plan to backport it to 1.3, tag 1.3.1 later today (Friday), and
> maybe ship it with httpd 2.2.9? Whew!
Nah, you were just (un)lucky to hit the right spot :-)
--
Bojan
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c
dbd/apr_dbd_freetds.c dbd/apr_dbd_odbc.c include/apu.h.in
Posted by Tom Donovan <do...@bellatlantic.net>.
Bojan Smojver wrote:
> On Fri, 2008-06-13 at 00:32 -0400, Tom Donovan wrote:
>
>> The second one doesn't change the behavior, just cleaning up -Wall
>> warnings, right?
>
> That's right. Thanks for reviewing.
>
> If nobody objects, I'm going to backport ODBC driver to 1.3.x then.
>
Builds & runs OK now on linux. Ditto for Windows.
-tom-
p.s. Man you guys move quick! My first non-trivial checkin was about 9 hours ago, and if I
understand it all correctly - you plan to backport it to 1.3, tag 1.3.1 later today (Friday), and
maybe ship it with httpd 2.2.9? Whew!
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c
dbd/apr_dbd_freetds.c dbd/apr_dbd_odbc.c include/apu.h.in
Posted by Bojan Smojver <bo...@rexursive.com>.
On Fri, 2008-06-13 at 14:35 +1000, Bojan Smojver wrote:
> If nobody objects, I'm going to backport ODBC driver to 1.3.x then.
This is giving me conflicts when backporting to 1.3.x:
-----------------------
svn merge
https://svn.apache.org/repos/asf/apr/apr-util/trunk/aprutil.dsw@667181
https://svn.apache.org/repos/asf/apr/apr-util/trunk/aprutil.dsw@667182
-----------------------
Should I just copy aprutil.dsw from the trunk?
--
Bojan
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c
dbd/apr_dbd_freetds.c dbd/apr_dbd_odbc.c include/apu.h.in
Posted by Bojan Smojver <bo...@rexursive.com>.
On Fri, 2008-06-13 at 00:32 -0400, Tom Donovan wrote:
> The second one doesn't change the behavior, just cleaning up -Wall
> warnings, right?
That's right. Thanks for reviewing.
If nobody objects, I'm going to backport ODBC driver to 1.3.x then.
--
Bojan
Re: svn commit: r667328 - in /apr/apr-util/trunk: dbd/apr_dbd.c
dbd/apr_dbd_freetds.c dbd/apr_dbd_odbc.c include/apu.h.in
Posted by Tom Donovan <do...@bellatlantic.net>.
Bojan Smojver wrote:
> On Fri, 2008-06-13 at 04:10 +0000, bojan@apache.org wrote:
>
>> @@ -646,7 +649,7 @@
>>
>> if (SQL_SUCCEEDED(rc) || rc == SQL_NO_DATA) {
>>
>> - if (rc = SQL_SUCCESS_WITH_INFO
>> + if (rc == SQL_SUCCESS_WITH_INFO
>> && ( len_indicator == SQL_NO_TOTAL || len_indicator >= bufsize) ) {
>> /* not the last read = a full buffer. CLOBs have a null terminator */
>> *len = bufsize - (IS_CLOB(bd->type) ? 1 : 0 );
>
> Tom, please check if the above is what you meant.
>
>> @@ -1327,7 +1331,7 @@
>> if (!(sq = strchr(s, '\'')))
>> return (char *) s;
>> /* count the single-quotes and allocate a new buffer */
>> - for (qcount = 1; sq = strchr(sq + 1, '\''); )
>> + for (qcount = 1; (sq = strchr(sq + 1, '\'')); )
>> qcount++;
>> newstr = apr_palloc(pool, strlen(s) + qcount + 1);
>>
>
> Ditto.
>
Yes to both.
The second one doesn't change the behavior, just cleaning up -Wall warnings, right?
-tom-