From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15566 invoked by alias); 15 Jan 2006 16:28:34 -0000 Received: (qmail 15543 invoked by uid 22791); 15 Jan 2006 16:28:33 -0000 X-Spam-Check-By: sourceware.org Received: from cantor.suse.de (HELO mx1.suse.de) (195.135.220.2) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 15 Jan 2006 16:28:30 +0000 Received: from Relay2.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 84F25E7D1 for ; Sun, 15 Jan 2006 17:28:27 +0100 (CET) Received: from aj by arthur.inka.de with local (Exim 4.51) id 1EyAjx-0002r8-Iu for libc-hacker@sources.redhat.com; Sun, 15 Jan 2006 17:28:25 +0100 From: Andreas Jaeger To: Glibc hackers Subject: [BZ#1950] fix some types OpenPGP: id=C272A126; url=http://www.suse.de/~aj/keys.txt Date: Sun, 15 Jan 2006 16:28:00 -0000 Message-ID: User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/21.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2006-01/txt/msg00066.txt.bz2 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-length: 1638 This patch replaces an int type by an enum for consistency. Tested on x86-64. Ok to commit? Andreas [BZ #1950] * posix/regex_internal.c (re_string_reconstruct): Adjust for build_wcs_upper_buffer change. (build_wcs_upper_buffer): Change return type. =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 Index: posix/regex_internal.c --- posix/regex_internal.c 15 Oct 2005 15:17:35 -0000 1.64 +++ posix/regex_internal.c 15 Jan 2006 16:15:12 -0000 @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, In= c. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . =20 @@ -259,7 +259,7 @@ build_wcs_buffer (re_string_t *pstr) /* Build wide character buffer PSTR->WCS like build_wcs_buffer, but for REG_ICASE. */ =20 -static int +static reg_errcode_t internal_function build_wcs_upper_buffer (re_string_t *pstr) { @@ -721,7 +721,7 @@ re_string_reconstruct (re_string_t *pstr { if (pstr->icase) { - int ret =3D build_wcs_upper_buffer (pstr); + reg_errcode_t ret =3D build_wcs_upper_buffer (pstr); if (BE (ret !=3D REG_NOERROR, 0)) return ret; } --=20 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj/ SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GPG fingerprint =3D 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 --=-=-= Content-Type: application/pgp-signature Content-length: 188 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQBDyngpOJpWPMJyoSYRAmbFAJ41nRi1cuyekoWTJvgG57dzI/PT9ACeJUqX rnFAoLKsPMpFzf1y0VUTPfY= =AJpU -----END PGP SIGNATURE----- --=-=-=--