projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-merge-changelog: add doc relating to use with bzr and hg.
[gnulib.git]
/
lib
/
uniconv
/
u-strconv-to-enc.h
diff --git
a/lib/uniconv/u-strconv-to-enc.h
b/lib/uniconv/u-strconv-to-enc.h
index
b6e6ebb
..
c15182f
100644
(file)
--- a/
lib/uniconv/u-strconv-to-enc.h
+++ b/
lib/uniconv/u-strconv-to-enc.h
@@
-1,5
+1,5
@@
/* Conversion from UTF-16/UTF-32 to legacy encodings.
/* Conversion from UTF-16/UTF-32 to legacy encodings.
- Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006-2007
, 2009-2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@
-24,9
+24,9
@@
FUNC (const UNIT *string,
size_t length = 0;
if (mem_iconveha ((const char *) string, (U_STRLEN (string) + 1) * sizeof (UNIT),
size_t length = 0;
if (mem_iconveha ((const char *) string, (U_STRLEN (string) + 1) * sizeof (UNIT),
- UTF_NAME, tocode,
- handler == iconveh_question_mark, handler,
- NULL, &result, &length) < 0)
+
UTF_NAME, tocode,
+
handler == iconveh_question_mark, handler,
+
NULL, &result, &length) < 0)
return NULL;
/* Verify the result has exactly one NUL byte, at the end. */
if (!(length > 0 && result[length-1] == '\0' && strlen (result) == length-1))
return NULL;
/* Verify the result has exactly one NUL byte, at the end. */
if (!(length > 0 && result[length-1] == '\0' && strlen (result) == length-1))
@@
-49,11
+49,11
@@
FUNC (const UNIT *string,
if (result == NULL)
{
if (utf8_string != tmpbuf)
if (result == NULL)
{
if (utf8_string != tmpbuf)
- {
- int saved_errno = errno;
- free (utf8_string);
- errno = saved_errno;
- }
+
{
+
int saved_errno = errno;
+
free (utf8_string);
+
errno = saved_errno;
+
}
return NULL;
}
if (utf8_string != tmpbuf)
return NULL;
}
if (utf8_string != tmpbuf)