X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funiconv%2Fu8-strconv-to-enc.c;h=a3f12b6b1e5431ecce1d5e84c78a12ae5419f3e1;hb=6a9b156fdf9c71c0bbc8bb0b3aa0262df5674dda;hp=7dee051a77a18b1ba50402be1b826e90e642779f;hpb=2b5d5f86a9426eda473497f3afc96af0cfbd52be;p=gnulib.git diff --git a/lib/uniconv/u8-strconv-to-enc.c b/lib/uniconv/u8-strconv-to-enc.c index 7dee051a7..a3f12b6b1 100644 --- a/lib/uniconv/u8-strconv-to-enc.c +++ b/lib/uniconv/u8-strconv-to-enc.c @@ -1,20 +1,18 @@ /* Conversion from UTF-8 to legacy encodings. Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. + 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 + by the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . */ /* Written by Bruno Haible . */ @@ -63,7 +61,7 @@ u8_strconv_to_encoding (const uint8_t *string, { result = NULL; length = 0; - if (mem_iconveha (string, u8_strlen (string) + 1, + if (mem_iconveha ((const char *) string, u8_strlen (string) + 1, "UTF-8", tocode, handler == iconveh_question_mark, handler, NULL, &result, &length) < 0)