From patchwork Thu Jul 8 14:59:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44222 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 07A6A398B890 for ; Thu, 8 Jul 2021 15:00:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07A6A398B890 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1625756442; bh=G1Yjmkg5dQDRnLW68/PEsmP43DNeROdXP7nzd9H6T48=; 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=R2q5/Ykg5N5/F3No9R/ywsfPGU8CaXIDiieE6vA0ceIkDVoPmR6Si5rzMvS9N8xVJ 1Q5q1Xl6/oBoP+rnBNDGTjNY5PnsU90nqLScX/vYtfKH4wIwi+nW4FAHxWPAm3mpA6 /uIAZGDGft/ircvdS4gO5z7s/aJ7oWiPqCq1aIMM= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id EC48D3939C2E for ; Thu, 8 Jul 2021 14:59:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EC48D3939C2E 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-224-Q0F703bkN6mzfvPlNq7q_A-1; Thu, 08 Jul 2021 10:59:33 -0400 X-MC-Unique: Q0F703bkN6mzfvPlNq7q_A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E63191B2C987 for ; Thu, 8 Jul 2021 14:59:32 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-5.ams2.redhat.com [10.36.115.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E27C7887F for ; Thu, 8 Jul 2021 14:59:32 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 01/30] socket: Add hidden prototype for setsockopt In-Reply-To: References: X-From-Line: 83f901d93a77b1a2b6792adaab9969b7cad92ed6 Mon Sep 17 00:00:00 2001 Message-Id: <83f901d93a77b1a2b6792adaab9969b7cad92ed6.1625755445.git.fweimer@redhat.com> Date: Thu, 08 Jul 2021 16:59:23 +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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 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_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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" --- include/sys/socket.h | 3 ++- sysdeps/mach/hurd/setsockopt.c | 2 +- sysdeps/unix/sysv/linux/setsockopt.c | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) Reviewed-by: Adhemerval Zanella Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell diff --git a/include/sys/socket.h b/include/sys/socket.h index 38a1f76b3b..a1d749f9fa 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -118,7 +118,8 @@ libc_hidden_proto (__recvmmsg64) Returns 0 on success, -1 for errors. */ extern int __setsockopt (int __fd, int __level, int __optname, const void *__optval, - socklen_t __optlen) attribute_hidden; + socklen_t __optlen); +libc_hidden_proto (__setsockopt) /* Put the current value for socket FD's option OPTNAME at protocol level LEVEL into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's diff --git a/sysdeps/mach/hurd/setsockopt.c b/sysdeps/mach/hurd/setsockopt.c index 283af7114c..165c085599 100644 --- a/sysdeps/mach/hurd/setsockopt.c +++ b/sysdeps/mach/hurd/setsockopt.c @@ -38,5 +38,5 @@ __setsockopt (int fd, return __hurd_dfail (fd, err); return 0; } - +libc_hidden_def (__setsockopt) weak_alias (__setsockopt, setsockopt) diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c index 2792f1b5a1..bb3017f89c 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.c +++ b/sysdeps/unix/sysv/linux/setsockopt.c @@ -90,7 +90,7 @@ setsockopt32 (int fd, int level, int optname, const void *optval, #endif int -setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) +__setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) { int r = setsockopt_syscall (fd, level, optname, optval, len); @@ -101,4 +101,5 @@ setsockopt (int fd, int level, int optname, const void *optval, socklen_t len) return r; } -weak_alias (setsockopt, __setsockopt) +libc_hidden_def (__setsockopt) +weak_alias (__setsockopt, setsockopt)