From patchwork Mon Aug 10 13:17:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 505644 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 8557714018C for ; Mon, 10 Aug 2015 23:17:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=kEJHV4XS; dkim-atps=neutral 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; q=dns; s=default; b=lvNZdPVv3wEmaUaAR8kUmTSvbkTq0 6zxkg8aDbRnhB78a3gqyXPnHDx8ZuuevKvm3wyiqBfazUnLdU69S7Anw551PLIHF 8+4Kxp76s2TmLNV76bJFjfoQXtP8Gy8rNEcTHKPHRqRKlNQ9380dCHCCHQBvrSqF M5h3MHJBV57Dsc= 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; s=default; bh=7y77OeWGlgx7VhvyqL88F6AT93U=; b=kEJ HV4XSff4YFE70JzBgzS9qBIaE9ETzC2b9kR6qA45SYdXymKjQK9uAXCFpz3B+KzQ F/3LFF/0AotybkNVVBwpXbp1BFkkUGlUOepxzog/LsDhCGKD0SuDNK9HUkP5NidF nAWHQ8X3vqzst24KPHsJbtJugWbgOSqxN/DzZkPg= Received: (qmail 20761 invoked by alias); 10 Aug 2015 13:17:48 -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 20750 invoked by uid 89); 10 Aug 2015 13:17:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx2.suse.de From: Andreas Schwab To: libc-alpha@sourceware.org Subject: [PATCH] Remove unused definition of __openat(64)_nocancel X-Yow: .. this must be what it's like to be a COLLEGE GRADUATE!! Date: Mon, 10 Aug 2015 15:17:43 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 This is no longer used since commit c6bb095. Andreas. * sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Don't define. * sysdeps/unix/sysv/linux/wordsize-64/openat.c (__openat64_nocancel): Likewise. --- sysdeps/unix/sysv/linux/openat.c | 18 ------------------ sysdeps/unix/sysv/linux/wordsize-64/openat.c | 3 --- 2 files changed, 21 deletions(-) diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c index ad8e31d..5d4cc0c 100644 --- a/sysdeps/unix/sysv/linux/openat.c +++ b/sysdeps/unix/sysv/linux/openat.c @@ -30,24 +30,6 @@ # define OPENAT openat #endif - -#define OPENAT_NOT_CANCEL CONCAT (OPENAT) -#define CONCAT(name) CONCAT2 (name) -#define CONCAT2(name) __##name##_nocancel - - -int -OPENAT_NOT_CANCEL (int fd, const char *file, int oflag, mode_t mode) -{ - - /* We have to add the O_LARGEFILE flag for openat64. */ -#ifdef MORE_OFLAGS - oflag |= MORE_OFLAGS; -#endif - - return INLINE_SYSCALL (openat, 4, fd, file, oflag, mode); -} - #define UNDERIZE(name) UNDERIZE_1 (name) #define UNDERIZE_1(name) __##name #define __OPENAT UNDERIZE (OPENAT) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/openat.c b/sysdeps/unix/sysv/linux/wordsize-64/openat.c index 12e0271..be31a35 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/openat.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/openat.c @@ -1,14 +1,11 @@ #define __openat64 __rename___openat64 -#define __openat64_nocancel __rename___openat64_nocancel #define openat64 __rename_openat64 #include "../openat.c" #undef __openat64 -#undef __openat64_nocancel #undef openat64 strong_alias (__openat, __openat64) hidden_ver (__openat, __openat64) -strong_alias (__openat_nocancel, __openat64_nocancel) weak_alias (openat, openat64)