summaryrefslogtreecommitdiff
path: root/lib/striconveha.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
commit6ffaa52cf732a84c0f8259dbc9b8183960ec5c33 (patch)
treed3136c22e3e805cfc0efe78412cce905a17e0c8d /lib/striconveha.h
parent591cbf5878b7d4105b275585b9db1324c9dfce56 (diff)
parentaf151c593704a40e10efb28d1e3dd59a23a661f3 (diff)
Merge branch 'release/debian/1.0-1'debian/1.0-1
Diffstat (limited to 'lib/striconveha.h')
-rw-r--r--lib/striconveha.h30
1 files changed, 11 insertions, 19 deletions
diff --git a/lib/striconveha.h b/lib/striconveha.h
index f787fea9..fe7b4243 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 <https://www.gnu.org/licenses/>. */
#ifndef _STRICONVEHA_H
#define _STRICONVEHA_H
#include <stdbool.h>
-#include <stddef.h>
+#include <stdlib.h>
#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: