Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 45101 invoked from network); 23 Jun 2004 19:09:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 23 Jun 2004 19:09:58 -0000 Received: (qmail 31581 invoked by uid 500); 23 Jun 2004 19:09:53 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 31246 invoked by uid 500); 23 Jun 2004 19:09:49 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 30285 invoked by uid 99); 23 Jun 2004 19:09:32 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FORGED_RCVD_HELO X-Spam-Check-By: apache.org Errors-To: Message-Id: <6.1.0.6.2.20040623134034.089a4ec0@pop3.rowe-clan.net> X-Sender: wrowe%rowe-clan.net@pop3.rowe-clan.net X-Mailer: QUALCOMM Windows Eudora Version 6.1.0.6 Date: Wed, 23 Jun 2004 13:41:28 -0500 To: dev@apr.apache.org From: "William A. Rowe, Jr." Subject: Re: cvs commit: apr-util/xlate xlate.c In-Reply-To: <20040623180002.7527.qmail@minotaur.apache.org> References: <20040623180002.7527.qmail@minotaur.apache.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Do we know what broke here from history? Was the pool arg added (breaking binary compat) in the 0.9 tree, or was this backing out a bugged change? At 01:00 PM 6/23/2004, stoddard@apache.org wrote: >stoddard 2004/06/23 11:00:02 > > Modified: xlate Tag: APU_0_9_BRANCH xlate.c > Log: > Fix build breakage on APR_HAVE_APR_ICONV path > > Revision Changes Path > No revision > No revision > 1.17.2.3 +3 -3 apr-util/xlate/xlate.c > > Index: xlate.c > =================================================================== > RCS file: /home/cvs/apr-util/xlate/xlate.c,v > retrieving revision 1.17.2.2 > retrieving revision 1.17.2.3 > diff -u -r1.17.2.2 -r1.17.2.3 > --- xlate.c 27 May 2004 21:55:02 -0000 1.17.2.2 > +++ xlate.c 23 Jun 2004 18:00:02 -0000 1.17.2.3 > @@ -178,9 +178,9 @@ > else { > /* reset the iconv descriptor, since it's now in an undefined > * state. */ > - apr_iconv_close(convset->ich); > - convset->ich = apr_iconv_open(convset->topage, convset->frompage); > - } > + apr_iconv_close(convset->ich, convset->pool); > + rv = apr_iconv_open(convset->topage, convset->frompage, convset->pool, &convset->ich); > + } > } > #endif /* APU_HAVE_APR_ICONV */ > > > >