projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'sprintf-posix'.
[gnulib.git]
/
lib
/
unistr
/
u32-to-u16.c
diff --git
a/lib/unistr/u32-to-u16.c
b/lib/unistr/u32-to-u16.c
index
fe2a96a
..
1d0bb4d
100644
(file)
--- a/
lib/unistr/u32-to-u16.c
+++ b/
lib/unistr/u32-to-u16.c
@@
-1,5
+1,5
@@
/* Convert UTF-32 string to UTF-16 string.
/* Convert UTF-32 string to UTF-16 string.
- Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006
-2007
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software; you can redistribute it and/or modify it
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software; you can redistribute it and/or modify it
@@
-61,11
+61,11
@@
FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
/* Fetch a Unicode character from the input string. */
uc = *s++;
/* Fetch a Unicode character from the input string. */
uc = *s++;
- /* No need to call the safe variant u32_mbtouc
_safe
, because
+ /* No need to call the safe variant u32_mbtouc, because
u16_uctomb will verify uc anyway. */
/* Store it in the output string. */
u16_uctomb will verify uc anyway. */
/* Store it in the output string. */
- count = u16_uctomb (result, uc, allocated - length);
+ count = u16_uctomb (result
+ length
, uc, allocated - length);
if (count == -1)
{
if (!(result == resultbuf || result == NULL))
if (count == -1)
{
if (!(result == resultbuf || result == NULL))
@@
-97,7
+97,7
@@
FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
memcpy ((char *) memory, (char *) result,
length * sizeof (DST_UNIT));
result = memory;
memcpy ((char *) memory, (char *) result,
length * sizeof (DST_UNIT));
result = memory;
- count = u16_uctomb (result, uc, allocated - length);
+ count = u16_uctomb (result
+ length
, uc, allocated - length);
if (count < 0)
abort ();
}
if (count < 0)
abort ();
}