From be8efac78d067c138ad8dda03df4336e73f94887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Jan 2022 11:51:07 +0100 Subject: New upstream version 1.0 --- lib/striconveha.h | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'lib/striconveha.h') diff --git a/lib/striconveha.h b/lib/striconveha.h index f787fea..fe7b424 100644 --- a/lib/striconveha.h +++ b/lib/striconveha.h @@ -1,34 +1,25 @@ /* Character set conversion with error handling and autodetection. - Copyright (C) 2002, 2005, 2007-2018 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007-2022 Free Software Foundation, Inc. Written by Bruno Haible. - This program is free software: you can redistribute it and/or - modify it under the terms of either: + This file 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 2.1 of the + License, or (at your option) any later version. - * 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. - - or - - * the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - or both in parallel, as here. - This program is distributed in the hope that it will be useful, + This file 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 General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ #ifndef _STRICONVEHA_H #define _STRICONVEHA_H #include -#include +#include #include "iconveh.h" @@ -78,7 +69,8 @@ extern char * str_iconveha (const char *src, const char *from_codeset, const char *to_codeset, bool transliterate, - enum iconv_ilseq_handler handler); + enum iconv_ilseq_handler handler) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; /* In the above, FROM_CODESET can also be one of the following values: -- cgit v1.2.3