Subject: Re: Commit: Re: [Fwd]: Re: Patch: Fix for Bug 1164, 2nd try
From: Hubert Figuiere (hfiguiere@teaser.fr)
Date: Tue Jun 05 2001 - 02:26:36 CDT
According to ha shao <hashao@chinese.com>:
> On Mon, Jun 04, 2001 at 10:11:27PM +0200, hfiguiere@teaser.fr wrote:
> > Committed:
> >
> > Checking in src/af/util/xp/ut_mbtowc.cpp;
> > /cvsroot/abi/src/af/util/xp/ut_mbtowc.cpp,v <-- ut_mbtowc.cpp
> > new revision: 1.19; previous revision: 1.18
> > done
>
> Somehow the commit failed:
> around 278
> ......................................................................
> } else {
> <<<<<<< ut_mbtowc.cpp
> if (errno==EINVAL) {
> UT_iconv_reset(cd); /* reset iconv, pointer might be messed up. */
> return 0; /* need more chars */
> }
> =======
> if (errno==EINVAL)
> {
> UT_iconv_reset(cd); /* reset iconv, pointer might be messed
> up. */
> return 0; /* need more chars */
> }
> >>>>>>> 1.19
> else {
> initialize();/*wrong seq*/
Nope. It didn't. I just took the code and indented it like it should be :-)
Just keep the second part (beetween ======= and >>>>>>> 1.19) and you'll be
fine.
Hub
This archive was generated by hypermail 2b25 : Tue Jun 05 2001 - 02:27:21 CDT