X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funinorm.h;h=206ee40683eb4f10dfea962d9b4c3efd02c25e9e;hb=969fe755730d23ba7ff21ae7511f66067d0a94d8;hp=ec14e09f6d541b04422142b77996fa0033c5d40c;hpb=4d0344cf0ca59b3d0e8e8396af65de1c50e06d9e;p=gnulib.git

diff --git a/lib/uninorm.h b/lib/uninorm.h
index ec14e09f6..206ee4068 100644
--- a/lib/uninorm.h
+++ b/lib/uninorm.h
@@ -1,5 +1,5 @@
 /* Normalization forms (composition and decomposition) of Unicode strings.
-   Copyright (C) 2001-2002, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 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
@@ -140,59 +140,59 @@ extern uninorm_t uninorm_decomposing_form (uninorm_t nf);
 /* Return the specified normalization form of a string.  */
 extern uint8_t *
        u8_normalize (uninorm_t nf, const uint8_t *s, size_t n,
-		     uint8_t *resultbuf, size_t *lengthp);
+                     uint8_t *resultbuf, size_t *lengthp);
 extern uint16_t *
        u16_normalize (uninorm_t nf, const uint16_t *s, size_t n,
-		      uint16_t *resultbuf, size_t *lengthp);
+                      uint16_t *resultbuf, size_t *lengthp);
 extern uint32_t *
        u32_normalize (uninorm_t nf, const uint32_t *s, size_t n,
-		      uint32_t *resultbuf, size_t *lengthp);
+                      uint32_t *resultbuf, size_t *lengthp);
 
 
 /* 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
-   way that comparing uN_normxfrm (S1) and uN_normxfrm (S2) with memcmp2() is
+/* Converts the string S of length N to a NUL-terminated byte sequence, in such
+   a way that comparing uN_normxfrm (S1) and uN_normxfrm (S2) with uN_cmp2() is
    equivalent to comparing S1 and S2 with uN_normcoll().
    NF must be either UNINORM_NFC or UNINORM_NFKC.  */
 extern char *
        u8_normxfrm (const uint8_t *s, size_t n, uninorm_t nf,
-		    char *resultbuf, size_t *lengthp);
+                    char *resultbuf, size_t *lengthp);
 extern char *
        u16_normxfrm (const uint16_t *s, size_t n, uninorm_t nf,
-		     char *resultbuf, size_t *lengthp);
+                     char *resultbuf, size_t *lengthp);
 extern char *
        u32_normxfrm (const uint32_t *s, size_t n, uninorm_t nf,
-		     char *resultbuf, size_t *lengthp);
+                     char *resultbuf, size_t *lengthp);
 
 
 /* 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.
@@ -213,8 +213,8 @@ struct uninorm_filter;
    Return the new filter, or NULL with errno set upon failure.  */
 extern struct uninorm_filter *
        uninorm_filter_create (uninorm_t nf,
-			      int (*stream_func) (void *stream_data, ucs4_t uc),
-			      void *stream_data);
+                              int (*stream_func) (void *stream_data, ucs4_t uc),
+                              void *stream_data);
 
 /* Stuff a Unicode character into a normalizing filter.
    Return 0 if successful, or -1 with errno set upon failure.  */