From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 14 Aug 2003 23:27:24 +0000 (+0000)
Subject: * memcasecmp.c: Remove unnecessary parentheses after 'defined'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e9740b2db6a4730809aff2d2487c35a162cb51a;p=pspp

* memcasecmp.c: Remove unnecessary parentheses after 'defined'.
(memcasecmp): Don't assume size_t fits in unsigned int.
Remove casts and duplicate code.
---

diff --git a/lib/memcasecmp.c b/lib/memcasecmp.c
index 3b2d838984..7cb4272341 100644
--- a/lib/memcasecmp.c
+++ b/lib/memcasecmp.c
@@ -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;
 }