From patchwork Mon Jun 7 17:38:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43746 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AF3443894421 for ; Mon, 7 Jun 2021 17:41:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF3443894421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623087716; bh=bGW8F9XgZ8bYE+6B0y4Fmp15izyjyEPAv/6mz0i8FxM=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=i58R3ZSnxsj1fv5Diw5tEaCreeptiLNyM5XEBLXjkZVc0QqX3upa8x2N54fZoJA2A EdJgPrYzlaUHPLziZiok4TEBr1lV1UVqtdjOysk5+JjZZjzxCSns8caGZ1simtpEHu eLwQLVN8W9SXetMlRxZCHxtADhn9KhuV2d8h4FaA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 43291393D013 for ; Mon, 7 Jun 2021 17:38:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 43291393D013 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-lPw0zijhP_qAXnvOyEFPig-1; Mon, 07 Jun 2021 13:38:22 -0400 X-MC-Unique: lPw0zijhP_qAXnvOyEFPig-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C21D21020C33 for ; Mon, 7 Jun 2021 17:38:21 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-60.ams2.redhat.com [10.36.115.60]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 269B45D9C0 for ; Mon, 7 Jun 2021 17:38:20 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 4/8] libio: Replace internal _IO_getdelim symbol with __getdelim In-Reply-To: References: X-From-Line: ec83a56fc2507ce754cf7493134a839e703ddc80 Mon Sep 17 00:00:00 2001 Message-Id: Date: Mon, 07 Jun 2021 19:38:19 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" __getdelim is exported, _IO_getdelim is not. Add a hidden prototype for __getdelim. --- iconv/gconv_conf.c | 4 ---- include/stdio.h | 1 + libio/iogetdelim.c | 7 +++---- libio/libioP.h | 1 - stdio-common/getline.c | 2 +- sysdeps/unix/sysv/linux/readonly-area.c | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index 682f949834..bb2c1d04ea 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -96,10 +96,6 @@ static const char builtin_aliases[] = #undef BUILTIN_ALIAS }; -#include -#define __getdelim(line, len, c, fp) _IO_getdelim (line, len, c, fp) - - /* Value of the GCONV_PATH environment variable. */ const char *__gconv_path_envvar; diff --git a/include/stdio.h b/include/stdio.h index 311adcf953..23b7fd288c 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -213,6 +213,7 @@ libc_hidden_ldbl_proto (fprintf) libc_hidden_ldbl_proto (vfprintf) libc_hidden_ldbl_proto (sprintf) libc_hidden_proto (ungetc) +libc_hidden_proto (__getdelim) libc_hidden_proto (fwrite) libc_hidden_proto (perror) libc_hidden_proto (remove) diff --git a/libio/iogetdelim.c b/libio/iogetdelim.c index 06450ca96c..3b1253bae8 100644 --- a/libio/iogetdelim.c +++ b/libio/iogetdelim.c @@ -37,7 +37,7 @@ null terminator), or -1 on error or EOF. */ ssize_t -_IO_getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) +__getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp) { ssize_t result; ssize_t cur_len = 0; @@ -122,6 +122,5 @@ unlock_return: _IO_release_lock (fp); return result; } - -weak_alias (_IO_getdelim, __getdelim) -weak_alias (_IO_getdelim, getdelim) +libc_hidden_def (__getdelim) +weak_alias (__getdelim, getdelim) diff --git a/libio/libioP.h b/libio/libioP.h index 4bad7f3c06..dc9a2ce9c8 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -734,7 +734,6 @@ libc_hidden_proto (_IO_getline) extern size_t _IO_getline_info (FILE *,char *, size_t, int, int, int *); libc_hidden_proto (_IO_getline_info) -extern ssize_t _IO_getdelim (char **, size_t *, int, FILE *); extern size_t _IO_getwline (FILE *,wchar_t *, size_t, wint_t, int); extern size_t _IO_getwline_info (FILE *,wchar_t *, size_t, wint_t, int, wint_t *); diff --git a/stdio-common/getline.c b/stdio-common/getline.c index de212243bb..52dfc58f2b 100644 --- a/stdio-common/getline.c +++ b/stdio-common/getline.c @@ -25,7 +25,7 @@ ssize_t __getline (char **lineptr, size_t *n, FILE *stream) { - return _IO_getdelim (lineptr, n, '\n', stream); + return __getdelim (lineptr, n, '\n', stream); } weak_alias (__getline, getline) diff --git a/sysdeps/unix/sysv/linux/readonly-area.c b/sysdeps/unix/sysv/linux/readonly-area.c index b42ec6ef3e..fa407d2f05 100644 --- a/sysdeps/unix/sysv/linux/readonly-area.c +++ b/sysdeps/unix/sysv/linux/readonly-area.c @@ -55,7 +55,7 @@ __readonly_area (const char *ptr, size_t size) while (! __feof_unlocked (fp)) { - if (_IO_getdelim (&line, &linelen, '\n', fp) <= 0) + if (__getdelim (&line, &linelen, '\n', fp) <= 0) break; char *p;