Rename argument.

diff --git a/ChangeLog b/ChangeLog
index 36bba2d..941b7f4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-08  Bruno Haible  <bruno@clisp.org>
+
+       * lib/uninorm.h (u8_normcmp, u16_normcmp, u32_normcmp, u8_normcoll,
+       u16_normcoll, u32_normcoll): Rename argument 'result' to 'resultp'.
+       * lib/uninorm/u-normcmp.h (FUNC): Likewise.
+       * lib/uninorm/u-normcoll.h (FUNC): Likewise.
+
 2009-03-07  Bruno Haible  <bruno@clisp.org>
 
        Adjust u*_normcmp, u*_normcoll API.

diff --git a/lib/uninorm.h b/lib/uninorm.h
index ec14e09..869630f 100644 (file)
--- a/lib/uninorm.h
+++ b/lib/uninorm.h
@@ -151,17 +151,17 @@ extern uint32_t *
 
 /* Compare S1 and S2, ignoring differences in normalization.
    NF must be either UNINORM_NFD or UNINORM_NFKD.
-   If successful, set *RESULT to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
    return 0.  Upon failure, return -1 with errno set.  */
 extern int
        u8_normcmp (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2,
-                  uninorm_t nf, int *result);
+                  uninorm_t nf, int *resultp);
 extern int
        u16_normcmp (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2,
-                   uninorm_t nf, int *result);
+                   uninorm_t nf, int *resultp);
 extern int
        u32_normcmp (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2,
-                   uninorm_t nf, int *result);
+                   uninorm_t nf, int *resultp);
 
 
 /* Converts the string S of length N to a string in locale encoding, in such a
@@ -182,17 +182,17 @@ extern char *
 /* Compare S1 and S2, ignoring differences in normalization, using the
    collation rules of the current locale.
    NF must be either UNINORM_NFC or UNINORM_NFKC.
-   If successful, set *RESULT to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
    return 0.  Upon failure, return -1 with errno set.  */
 extern int
        u8_normcoll (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2,
-                   uninorm_t nf, int *result);
+                   uninorm_t nf, int *resultp);
 extern int
        u16_normcoll (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2,
-                    uninorm_t nf, int *result);
+                    uninorm_t nf, int *resultp);
 extern int
        u32_normcoll (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2,
-                    uninorm_t nf, int *result);
+                    uninorm_t nf, int *resultp);
 
 
 /* Normalization of a stream of Unicode characters.

diff --git a/lib/uninorm/u-normcmp.h b/lib/uninorm/u-normcmp.h
index 0305fbc..307f89b 100644 (file)
--- a/lib/uninorm/u-normcmp.h
+++ b/lib/uninorm/u-normcmp.h
@@ -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)];
@@ -66,6 +66,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;
 }

diff --git a/lib/uninorm/u-normcoll.h b/lib/uninorm/u-normcoll.h
index a8bf29c..e30880b 100644 (file)
--- a/lib/uninorm/u-normcoll.h
+++ b/lib/uninorm/u-normcoll.h
@@ -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)
 {
   char buf1[2048];
   char buf2[2048];
@@ -60,6 +60,6 @@ FUNC (const UNIT *s1, size_t n1, const UNIT *s2, size_t n2,
     free (transformed2);
   if (transformed1 != buf1)
     free (transformed1);
-  *result = cmp;
+  *resultp = cmp;
   return 0;
 }