Fix bug in error handling code.

diff --git a/ChangeLog b/ChangeLog
index c859ea6..af5da00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-15  Bruno Haible  <bruno@clisp.org>
 
+       * lib/uniconv/u-conv-to-enc.h (FUNC): Fix return value when U_TO_U8
+       fails.
+
+2008-04-15  Bruno Haible  <bruno@clisp.org>
+
        * lib/trim.c (trim2): Fix argument of isspace() macro.
 
 2008-04-15  Paolo Bonzini  <bonzini@gnu.org>

diff --git a/lib/uniconv/u-conv-to-enc.h b/lib/uniconv/u-conv-to-enc.h
index fa5835d..b69a2b7 100644 (file)
--- a/lib/uniconv/u-conv-to-enc.h
+++ b/lib/uniconv/u-conv-to-enc.h
@@ -1,5 +1,5 @@
 /* Conversion from UTF-16/UTF-32 to legacy encodings.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2008 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
@@ -67,7 +67,7 @@ FUNC (const char *tocode,
 
   utf8_src = U_TO_U8 (src, srclen, tmpbuf, &tmpbufsize);
   if (utf8_src == NULL)
-    return NULL;
+    return -1;
   utf8_srclen = tmpbufsize;
 
   if (offsets != NULL)