iconv: Remove public declaration of __gconv_transliterate

Commit ba7b4d294b ("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>
This commit is contained in:
Florian Weimer 2019-05-15 07:16:47 +02:00
parent 04b261bdc1
commit 7ac6fad987
5 changed files with 17 additions and 11 deletions

View File

@ -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.

View File

@ -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 */

View File

@ -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. */

View File

@ -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>

View File

@ -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