[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-gnulib] memcasecmp cleanup
From: |
Paul Eggert |
Subject: |
[Bug-gnulib] memcasecmp cleanup |
Date: |
14 Aug 2003 16:31:37 -0700 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 |
I installed this:
2003-08-14 Paul Eggert <address@hidden>
* memcasecmp.c: Remove unnecessary parentheses after 'defined'.
(memcasecmp): Don't assume size_t fits in unsigned int.
Remove casts and duplicate code.
Index: memcasecmp.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/memcasecmp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -p -u -r1.9 -r1.10
--- memcasecmp.c 4 Jun 2003 19:22:29 -0000 1.9
+++ memcasecmp.c 14 Aug 2003 23:27:24 -0000 1.10
@@ -1,5 +1,5 @@
/* Case-insensitive buffer comparator.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2003 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
@@ -23,10 +23,10 @@
#include <ctype.h>
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+#if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
# define IN_CTYPE_DOMAIN(Char) 1
#else
-# define IN_CTYPE_DOMAIN(Char) isascii(Char)
+# define IN_CTYPE_DOMAIN(Char) isascii (Char)
#endif
#define ISLOWER(Char) (IN_CTYPE_DOMAIN (Char) && islower (Char))
@@ -45,15 +45,16 @@
int
memcasecmp (const void *vs1, const void *vs2, size_t n)
{
- unsigned int i;
- unsigned char const *s1 = (unsigned char const *) vs1;
- unsigned char const *s2 = (unsigned char const *) vs2;
+ size_t i;
+ char const *s1 = vs1;
+ char const *s2 = vs2;
for (i = 0; i < n; i++)
{
- unsigned char u1 = *s1++;
- unsigned char u2 = *s2++;
- if (TOUPPER (u1) != TOUPPER (u2))
- return TOUPPER (u1) - TOUPPER (u2);
+ unsigned char u1 = s1[i];
+ unsigned char u2 = s2[i];
+ int diff = TOUPPER (u1) - TOUPPER (u2);
+ if (diff)
+ return diff;
}
return 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Bug-gnulib] memcasecmp cleanup,
Paul Eggert <=