summaryrefslogtreecommitdiff
path: root/lib/striconveh.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-01-08 11:53:52 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-01-08 11:53:52 +0100
commitfa838e76139763f902c7d27cb9e1d393ed6a15e4 (patch)
tree7d0ae09775ea950056193eaa2ca93844299d46f1 /lib/striconveh.h
parentc78359d9542c86b972aac373efcf7bc7a8a560e5 (diff)
parent2959e59fab3bab834368adefd90bd4b1b094366b (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/striconveh.h')
-rw-r--r--lib/striconveh.h33
1 files changed, 13 insertions, 20 deletions
diff --git a/lib/striconveh.h b/lib/striconveh.h
index 1b8e221..e152a04 100644
--- a/lib/striconveh.h
+++ b/lib/striconveh.h
@@ -1,33 +1,24 @@
/* Character set conversion with error handling.
- Copyright (C) 2001-2007, 2009-2018 Free Software Foundation, Inc.
+ Copyright (C) 2001-2007, 2009-2022 Free Software Foundation, Inc.
Written by Bruno Haible and Simon Josefsson.
- 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 _STRICONVEH_H
#define _STRICONVEH_H
-#include <stddef.h>
+#include <stdlib.h>
#if HAVE_ICONV
#include <iconv.h>
#endif
@@ -104,7 +95,8 @@ extern int
extern char *
str_cd_iconveh (const char *src,
const iconveh_t *cd,
- enum iconv_ilseq_handler handler);
+ enum iconv_ilseq_handler handler)
+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE;
#endif
@@ -138,7 +130,8 @@ extern int
extern char *
str_iconveh (const char *src,
const char *from_codeset, const char *to_codeset,
- enum iconv_ilseq_handler handler);
+ enum iconv_ilseq_handler handler)
+ _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE;
#ifdef __cplusplus