X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Funinorm%2Fu-normcmp.h;h=5cda5db39a2d1ba64edf16a7449ab01300ee9060;hb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;hp=0305fbce312a7510ee52da07d1309442fbff0c81;hpb=4d0344cf0ca59b3d0e8e8396af65de1c50e06d9e;p=pspp

diff --git a/lib/uninorm/u-normcmp.h b/lib/uninorm/u-normcmp.h
index 0305fbce31..5cda5db39a 100644
--- a/lib/uninorm/u-normcmp.h
+++ b/lib/uninorm/u-normcmp.h
@@ -1,5 +1,5 @@
 /* Normalization insensitive comparison of Unicode strings.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009-2010 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,7 +17,7 @@
 
 int
 FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
-      uninorm_t nf, int *result)
+      uninorm_t nf, int *resultp)
 {
   UNIT buf1[2048 / sizeof (UNIT)];
   UNIT buf2[2048 / sizeof (UNIT)];
@@ -40,24 +40,17 @@ FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
   if (norms2 == NULL)
     {
       if (norms1 != buf1)
-	{
-	  int saved_errno = errno;
-	  free (norms1);
-	  errno = saved_errno;
-	}
+        {
+          int saved_errno = errno;
+          free (norms1);
+          errno = saved_errno;
+        }
       return -1;
     }
 
   /* Compare the normalized strings.  */
-  cmp = U_CMP (norms1, norms2, MIN (norms1_length, norms2_length));
-  if (cmp == 0)
-    {
-      if (norms1_length < norms2_length)
-	cmp = -1;
-      else if (norms1_length > norms2_length)
-	cmp = 1;
-    }
-  else if (cmp > 0)
+  cmp = U_CMP2 (norms1, norms1_length, norms2, norms2_length);
+  if (cmp > 0)
     cmp = 1;
   else if (cmp < 0)
     cmp = -1;
@@ -66,6 +59,6 @@ FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
     free (norms2);
   if (norms1 != buf1)
     free (norms1);
-  *result = cmp;
+  *resultp = cmp;
   return 0;
 }