From 2c6dd019d311dfb8c1ac8135dcfb41f46f75e8a7 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 7 Jan 2000 06:59:36 +0000 Subject: [PATCH] =?utf8?q?Use=20`#if'=20instead=20of=20`#ifdef'=20for=20`H?= =?utf8?q?AVE=5FCONFIG=5FH'.=20Capitalize=20all=20macro=20parameters.=20(m?= =?utf8?q?emcasecmp):=20Ansideclify.=20Don't=20cast=20away=20`const'ness?= =?utf8?q?=20of=20parameters.=20Suggestions=20from=20Fran=E7ois=20Pinard.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/memcasecmp.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c index a2e42e8ecf..18dd31f6e4 100644 --- a/lib/memcasecmp.c +++ b/lib/memcasecmp.c @@ -1,5 +1,5 @@ /* Case-insensitive buffer comparator. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Jim Meyering (meyering@na-net.ornl.gov) */ +/* Written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H +#if HAVE_CONFIG_H # include #endif @@ -25,16 +25,16 @@ #include #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) -# define IN_CTYPE_DOMAIN(c) 1 +# define IN_CTYPE_DOMAIN(Char) 1 #else -# define IN_CTYPE_DOMAIN(c) isascii(c) +# define IN_CTYPE_DOMAIN(Char) isascii(Char) #endif -#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) +#define ISLOWER(Char) (IN_CTYPE_DOMAIN (Char) && islower (Char)) #if _LIBC || STDC_HEADERS -# define TOUPPER(c) toupper (c) +# define TOUPPER(Char) toupper (Char) #else -# define TOUPPER(c) (ISLOWER (c) ? toupper (c) : (c)) +# define TOUPPER(Char) (ISLOWER (Char) ? toupper (Char) : (Char)) #endif #include "memcasecmp.h" @@ -44,14 +44,11 @@ join -i works with sort -f. */ int -memcasecmp (vs1, vs2, n) - const void *vs1; - const void *vs2; - size_t n; +memcasecmp (const void *vs1, const void *vs2, size_t n) { unsigned int i; - unsigned char *s1 = (unsigned char *) vs1; - unsigned char *s2 = (unsigned char *) vs2; + unsigned char const *s1 = (unsigned char const *) vs1; + unsigned char const *s2 = (unsigned char const *) vs2; for (i = 0; i < n; i++) { unsigned char u1 = *s1++; -- 2.30.2