summaryrefslogtreecommitdiff
path: root/lib/uninorm.h
diff options
context:
space:
mode:
authorAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:17 +0200
committerAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:17 +0200
commitbd6adfa17d453e4c486e36fed4c5779db90a8a0e (patch)
tree9798677560d5f99061afe9f0db105a8c97f2438a /lib/uninorm.h
parent79ca645d222db2e158784642c3b464a47bea26f3 (diff)
parent3e0814cd9862b89c7a39672672937477bd87ddfb (diff)
Merge commit 'upstream/0.9.3'
Diffstat (limited to 'lib/uninorm.h')
-rw-r--r--lib/uninorm.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/uninorm.h b/lib/uninorm.h
index 6850967e..5fdcc22a 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
@@ -143,13 +143,13 @@ 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.
@@ -158,13 +158,13 @@ extern uint32_t *
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 *resultp);
+ 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 *resultp);
+ 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 *resultp);
+ uninorm_t nf, int *resultp);
/* Converts the string S of length N to a NUL-terminated byte sequence, in such
@@ -173,13 +173,13 @@ extern int
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
@@ -189,13 +189,13 @@ extern char *
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 *resultp);
+ 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 *resultp);
+ 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 *resultp);
+ uninorm_t nf, int *resultp);
/* Normalization of a stream of Unicode characters.
@@ -216,8 +216,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. */