From patchwork Tue May 14 18:37:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1099641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-101974-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Jwc+xkLj"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 453RHk4h6tz9sBb for ; Wed, 15 May 2019 04:37:22 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=w6H RVCXjsBW6x2sBZm74uw2oRmD0tXAGUXvt3pH+0/EQzwsHrw4yfP0laURRG7FbyWi RVj686OuCrNKV7aExVKUen04w43p8DDJgYEjZzbO/4c8Z6TL+lJo5sAxn4S3vIjZ neZbfruIT60/duaeod1CJnjT5VdKPk/zjSmIybsE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=OhzKN+YK7 Fmr66vGiXG5HbJnNKc=; b=Jwc+xkLjSZy7eAyqYvQMWs10wXZ6uqRCI0Cu0npVI Eb7vCYaICoz5jDaYtCg2r94FaVWrbrVTAPIi78tPV+RbPGFTGnfPuE+K9uZN0zk9 5BrB7PpDn1NAp+bOl3L7T5Jx+N6STFSzwrPL16VH7UrOcDBSsbhkcPR7m/DrfDoq 9I= Received: (qmail 32260 invoked by alias); 14 May 2019 18:37:15 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 32251 invoked by uid 89); 14 May 2019 18:37:15 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=transliteration X-HELO: mx1.redhat.com From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] iconv: Remove public declaration of __gconv_transliterate Date: Tue, 14 May 2019 20:37:10 +0200 Message-ID: <87zhnozxux.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Commit ba7b4d294b01870ce3497971e9d07ee261cdc540 ("Complete the removal of __gconv_translit_find") added a declaration of the GLIBC_PRIVATE function, __gconv_transliterate, to the installed header . It should have been added to the internal header. 2019-05-14 Florian Weimer * iconv/gconv.h (__gconv_transliterate): Move declaration … * iconv/gconv_int.h (__gconv_transliterate): … here. * iconv/loop.c: Include instead of . * iconv/skeleton.c: Likewise. Reviewed-by: Carlos O'Donell 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 #include -#include +#include #include #include #include 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 -#include +#include #include #define __need_size_t #define __need_NULL