From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16017 invoked by alias); 5 Aug 2005 01:10:41 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 15156 invoked by uid 22791); 5 Aug 2005 01:10:20 -0000 Received: from ausmtp01.au.ibm.com (HELO ausmtp01.au.ibm.com) (202.81.18.186) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Fri, 05 Aug 2005 01:10:20 +0000 Received: from sd0208e0.au.ibm.com (d23rh904.au.ibm.com [202.81.18.202]) by ausmtp01.au.ibm.com (8.12.10/8.12.10) with ESMTP id j751Cpn0096200 for ; Fri, 5 Aug 2005 11:12:55 +1000 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.250.242]) by sd0208e0.au.ibm.com (8.12.10/NCO/VERS6.7) with ESMTP id j751D5mE175640 for ; Fri, 5 Aug 2005 11:13:05 +1000 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.12.11/8.13.3) with ESMTP id j751A8nf001970 for ; Fri, 5 Aug 2005 11:10:09 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av01.au.ibm.com (8.12.11/8.12.11) with ESMTP id j751A8Ne001963 for ; Fri, 5 Aug 2005 11:10:08 +1000 Received: from [10.61.2.156] (haven.au.ibm.com [9.190.164.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.au.ibm.com (Postfix) with ESMTP id ED6E273518 for ; Fri, 5 Aug 2005 11:10:34 +1000 (EST) Message-ID: <42F2BC2B.1040302@au.ibm.com> Date: Fri, 05 Aug 2005 01:10:00 -0000 From: Ben Elliston User-Agent: Debian Thunderbird 1.0.2 (X11/20050331) MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: PATCH: remove readline warnings Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigD74FC06D70D25322B9E53E96" X-SW-Source: 2005-08/txt/msg00079.txt.bz2 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigD74FC06D70D25322B9E53E96 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-length: 3193 This patch removes a handful of warnings when compiling readline. Okay for mainline? 2005-08-05 Ben Elliston * bind.c (bool_to_int): Make value parameter const. * mbutil.c (_rl_get_char_len): Make src parameter const. Remove cast on src when calling mbrlen. (_rl_adjust_point): Make string parameter const. * rlmbutil.h (_rl_get_char_len): Update prototype. (_rl_adjust_point): Likewise. * util.c (_rl_stricmp): Make all parameters const. Index: bind.c =================================================================== RCS file: /home/bje/src-cvs/src/readline/bind.c,v retrieving revision 1.6 diff -u -p -r1.6 bind.c --- bind.c 27 Jan 2004 22:25:15 -0000 1.6 +++ bind.c 5 Aug 2005 01:02:55 -0000 @@ -1373,7 +1373,7 @@ find_string_var (name) values result in 0 (false). */ static int bool_to_int (value) - char *value; + const char *value; { return (value == 0 || *value == '\0' || (_rl_stricmp (value, "on") == 0) || Index: mbutil.c =================================================================== RCS file: /home/bje/src-cvs/src/readline/mbutil.c,v retrieving revision 1.4 diff -u -p -r1.4 mbutil.c --- mbutil.c 27 Jan 2004 22:25:15 -0000 1.4 +++ mbutil.c 5 Aug 2005 01:02:55 -0000 @@ -196,12 +196,12 @@ _rl_find_prev_mbchar_internal (string, s if it couldn't parse a complete multibyte character. */ int _rl_get_char_len (src, ps) - char *src; + const char *src; mbstate_t *ps; { size_t tmp; - tmp = mbrlen((const char *)src, (size_t)strlen (src), ps); + tmp = mbrlen(src, (size_t) strlen (src), ps); if (tmp == (size_t)(-2)) { /* shorted to compose multibyte char */ @@ -256,7 +256,7 @@ _rl_compare_chars (buf1, pos1, ps1, buf2 it returns -1 */ int _rl_adjust_point(string, point, ps) - char *string; + const char *string; int point; mbstate_t *ps; { Index: rlmbutil.h =================================================================== RCS file: /home/bje/src-cvs/src/readline/rlmbutil.h,v retrieving revision 1.5 diff -u -p -r1.5 rlmbutil.h --- rlmbutil.h 17 Dec 2003 20:13:54 -0000 1.5 +++ rlmbutil.h 5 Aug 2005 01:02:55 -0000 @@ -83,8 +83,8 @@ extern int _rl_find_next_mbchar PARAMS(( #ifdef HANDLE_MULTIBYTE extern int _rl_compare_chars PARAMS((char *, int, mbstate_t *, char *, int, mbstate_t *)); -extern int _rl_get_char_len PARAMS((char *, mbstate_t *)); -extern int _rl_adjust_point PARAMS((char *, int, mbstate_t *)); +extern int _rl_get_char_len PARAMS((const char *, mbstate_t *)); +extern int _rl_adjust_point PARAMS((const char *, int, mbstate_t *)); extern int _rl_read_mbchar PARAMS((char *, int)); extern int _rl_read_mbstring PARAMS((int, char *, int)); Index: util.c =================================================================== RCS file: /home/bje/src-cvs/src/readline/util.c,v retrieving revision 1.4 diff -u -p -r1.4 util.c --- util.c 8 Dec 2002 22:31:37 -0000 1.4 +++ util.c 5 Aug 2005 01:02:55 -0000 @@ -283,7 +283,7 @@ _rl_strnicmp (string1, string2, count) /* strcmp (), but caseless. */ int _rl_stricmp (string1, string2) - char *string1, *string2; + const char *string1, *string2; { register char ch1, ch2; --------------enigD74FC06D70D25322B9E53E96 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" Content-length: 256 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFC8rwrMGpskFPkywkRApVBAJ9WrJ343KH1a1lpQQJthzE92xvCrACfYeIG 2FlP2+5HQENIWeh4BnBSdno= =mh/K -----END PGP SIGNATURE----- --------------enigD74FC06D70D25322B9E53E96--