diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-05-15 07:16:47 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-05-15 07:16:47 +0200 |
| commit | 7ac6fad987c28dc5e0e7964084260f163179be68 (patch) | |
| tree | 73a6e215212fddaa4a0fa82fe0ba55a078f5958b | |
| parent | 04b261bdc13afd1f7644c756a23df3d43d400fa4 (diff) | |
| download | glibc-7ac6fad987c28dc5e0e7964084260f163179be68.tar glibc-7ac6fad987c28dc5e0e7964084260f163179be68.tar.gz glibc-7ac6fad987c28dc5e0e7964084260f163179be68.tar.bz2 glibc-7ac6fad987c28dc5e0e7964084260f163179be68.zip | |
iconv: Remove public declaration of __gconv_transliterate
Commit ba7b4d294b01870ce3497971e9d07ee261cdc540 ("Complete the
removal of __gconv_translit_find") added a declaration of the
GLIBC_PRIVATE function, __gconv_transliterate, to the installed
header <gconv.h>. It should have been added to the internal
<gconv_int.h> header.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | iconv/gconv.h | 9 | ||||
| -rw-r--r-- | iconv/gconv_int.h | 8 | ||||
| -rw-r--r-- | iconv/loop.c | 2 | ||||
| -rw-r--r-- | iconv/skeleton.c | 2 |
5 files changed, 17 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2019-05-15 Florian Weimer <fweimer@redhat.com> + + * iconv/gconv.h (__gconv_transliterate): Move declaration … + * iconv/gconv_int.h (__gconv_transliterate): … here. + * iconv/loop.c: Include <iconv/gconv_int.h> instead of <gconv.h>. + * iconv/skeleton.c: Likewise. + 2019-05-14 Florian Weimer <fweimer@redhat.com> Linux: Add the tgkill function. diff --git a/iconv/gconv.h b/iconv/gconv.h index 12fd775604..5ad26c06ac 100644 --- a/iconv/gconv.h +++ b/iconv/gconv.h @@ -142,13 +142,4 @@ typedef struct __gconv_info __extension__ struct __gconv_step_data __data[0]; } *__gconv_t; -/* Transliteration using the locale's data. */ -extern int __gconv_transliterate (struct __gconv_step *step, - struct __gconv_step_data *step_data, - const unsigned char *inbufstart, - const unsigned char **inbufp, - const unsigned char *inbufend, - unsigned char **outbufstart, - size_t *irreversible); - #endif /* gconv.h */ diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 4635bee54d..ea41d6feaa 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -223,6 +223,14 @@ extern void __gconv_get_builtin_trans (const char *name, struct __gconv_step *step) attribute_hidden; +/* Transliteration using the locale's data. */ +extern int __gconv_transliterate (struct __gconv_step *step, + struct __gconv_step_data *step_data, + const unsigned char *inbufstart, + const unsigned char **inbufp, + const unsigned char *inbufend, + unsigned char **outbufstart, + size_t *irreversible); libc_hidden_proto (__gconv_transliterate) /* If NAME is an codeset alias expand it. */ diff --git a/iconv/loop.c b/iconv/loop.c index 316bbf62b7..fa98c1a521 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -49,7 +49,7 @@ #include <assert.h> #include <endian.h> -#include <gconv.h> +#include <iconv/gconv_int.h> #include <stdint.h> #include <string.h> #include <wchar.h> diff --git a/iconv/skeleton.c b/iconv/skeleton.c index d98a78acc2..cc39fdcc70 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -133,7 +133,7 @@ */ #include <assert.h> -#include <gconv.h> +#include <iconv/gconv_int.h> #include <string.h> #define __need_size_t #define __need_NULL |