Mailing-List: contact dev-help@apr.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (athena.apache.org: domain of trawick@gmail.com designates
 209.85.214.50 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type:content-transfer-encoding;
        b=UcXxhA/94auUektO1sUESmPOe4uiumpnlKrdO9MyN1zSDZ4ztVOoHZHa9EDeVPBQrh
         +6LZSAmimNnLxMosP+MvnewUpAUHXfIktu8PlC4X0kEBTlVk1auVtcWjJmPMwOfXZZry
         epxdhUmlgFDZJNx5HY3Ngevd/GWBGVyBX5iEY=
MIME-Version: 1.0
In-Reply-To: <20110306163446.EC605238899C@eris.apache.org>
References: <20110306163446.EC605238899C@eris.apache.org>
Date: Wed, 9 Mar 2011 13:40:42 -0500
Message-ID: <AANLkTinBnk3p5QKJM0=j=-mDfxqda3974-QimoCCYie_@mail.gmail.com>
Subject: Re: svn commit: r1078507 - /apr/apr/trunk/dbd/apr_dbd_odbc.c
From: Jeff Trawick <trawick@gmail.com>
To: dev@apr.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Sun, Mar 6, 2011 at 11:34 AM,  <trawick@apache.org> wrote:
> Author: trawick
> Date: Sun Mar =A06 16:34:46 2011
> New Revision: 1078507
>
> URL: http://svn.apache.org/viewvc?rev=3D1078507&view=3Drev
> Log:
> style changes only -- make it look a lot more like the bulk of APR
>
> Modified:
> =A0 =A0apr/apr/trunk/dbd/apr_dbd_odbc.c
>
> Modified: apr/apr/trunk/dbd/apr_dbd_odbc.c
> URL: http://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_odbc.c?rev=3D=
1078507&r1=3D1078506&r2=3D1078507&view=3Ddiff
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- apr/apr/trunk/dbd/apr_dbd_odbc.c (original)
> +++ apr/apr/trunk/dbd/apr_dbd_odbc.c Sun Mar =A06 16:34:46 2011
> @@ -1268,11 +1304,12 @@ static int odbc_get_row(apr_pool_t * poo
>
> =A0 =A0 /* mark all the columns as needing SQLGetData unless they are bou=
nd =A0*/
> =A0 =A0 for (c =3D 0; c < res->ncols; c++) {
> - =A0 =A0 =A0 =A0if (res->colstate[c] !=3D COL_BOUND)
> + =A0 =A0 =A0 =A0if (res->colstate[c] !=3D COL_BOUND) {
> =A0 =A0 =A0 =A0 =A0 =A0 res->colstate[c] =3D COL_AVAIL;
> - =A0 =A0 =A0 =A0 =A0 =A0/* some drivers do not null-term zero-len CHAR d=
ata */
> - =A0 =A0 =A0 =A0 =A0 =A0if (res->colptrs[c] )
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* (char *) res->colptrs[c] =3D 0;
> + =A0 =A0 =A0 =A0}
> + =A0 =A0 =A0 =A0/* some drivers do not null-term zero-len CHAR data */
> + =A0 =A0 =A0 =A0if (res->colptrs[c])
> + =A0 =A0 =A0 =A0 =A0 =A0*(char *)res->colptrs[c] =3D 0;
> =A0 =A0 }

I just remembered...

The original code was a bit disturbing because of the indentation:

    /* mark all the columns as needing SQLGetData unless they are bound  */
    for (c =3D 0; c < res->ncols; c++) {
        if (res->colstate[c] !=3D COL_BOUND)
            res->colstate[c] =3D COL_AVAIL;
            /* some drivers do not null-term zero-len CHAR data */
            if (res->colptrs[c] )
                * (char *) res->colptrs[c] =3D 0;
    }

>From the indentation, it looks like the second 'if' is part of a block
starting with res->colstate[c] =3D COL_AVAIL.

The behavior stayed the same across the reformat, and I can't confirm
that the original code was broken, but still...