From patchwork Tue Jul 21 23:22:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 498365 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 1A1EC1402ED for ; Wed, 22 Jul 2015 09:22:27 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=th/ImITN; 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:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; q= dns; s=default; b=ZE8lbcMHIpaRiJ601c77LX+znay6fODGA3lM1gDO5mhaDK mwwZGO+urCpJ/9BNGItjQYIc4aNZFP/j9kyHUFzgzvLS+kqNEIj86RzGAHncrcFW lup+GvH5Q2167QmU6mMlF7HoZYLQj1WvJ8uBcchEJ5BClaJdhN9sOPbk9GAaw= 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:mime-version:content-type :content-transfer-encoding:from:to:subject:message-id:date; s= default; bh=sqSkwAxOn1qf09sfEgJ3D5faFtc=; b=th/ImITNNWMZtAkGL9n4 kwLLmp9VkwRyVYKamE08ybnyi9tXwKILunyrXP9vBGntULA5lV3cXaIRncui1yAj zjF+7ITlZeaz1OEDe0w475YzTMvv+ss4mWAb4lkUFB02kwMEILg1fsYQxSUVO5xz Qat8Nt1kgV2vlXmHuieJ128= Received: (qmail 30101 invoked by alias); 21 Jul 2015 23:22:20 -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 30088 invoked by uid 89); 21 Jul 2015 23:22:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=AWL, BAYES_05, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Use only nacl_irt_dev_filename, never nacl_irt_filename. Message-Id: <20150721232217.4B5A02C3B32@topped-with-meat.com> Date: Tue, 21 Jul 2015 16:22:17 -0700 (PDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=hOe2yjtxAAAA:8 a=kj9zAlcOel0A:10 a=SUVQOwHuGarLmidpRCkA:9 a=CjuIK1q_8ugA:10 * sysdeps/nacl/nacl-interface-list.h: Remove nacl_irt_filename. * sysdeps/nacl/open.c (__libc_open): Use __nacl_irt_dev_filename rather than __nacl_irt_filename. * sysdeps/nacl/xstat.c (__xstat): Likewise. diff --git a/sysdeps/nacl/nacl-interface-list.h b/sysdeps/nacl/nacl-interface-list.h index d098147..cb33751 100644 --- a/sysdeps/nacl/nacl-interface-list.h +++ b/sysdeps/nacl/nacl-interface-list.h @@ -21,8 +21,6 @@ NACL_MANDATORY_INTERFACE (rtld, NACL_MANDATORY_INTERFACE (rtld, NACL_IRT_FDIO_v0_1, nacl_irt_fdio) NACL_MANDATORY_INTERFACE (rtld, - NACL_IRT_FILENAME_v0_1, nacl_irt_filename) -NACL_MANDATORY_INTERFACE (rtld, NACL_IRT_MEMORY_v0_3, nacl_irt_memory) NACL_MANDATORY_INTERFACE (libc, NACL_IRT_THREAD_v0_1, nacl_irt_thread) diff --git a/sysdeps/nacl/open.c b/sysdeps/nacl/open.c index cb4700f..381751a 100644 --- a/sysdeps/nacl/open.c +++ b/sysdeps/nacl/open.c @@ -38,7 +38,7 @@ __libc_open (const char *file, int oflag, ...) } int fd; - return NACL_CALL (__nacl_irt_filename.open (file, oflag, mode, &fd), fd); + return NACL_CALL (__nacl_irt_dev_filename.open (file, oflag, mode, &fd), fd); } libc_hidden_def (__libc_open) weak_alias (__libc_open, __open) diff --git a/sysdeps/nacl/xstat.c b/sysdeps/nacl/xstat.c index 022cf02..8180c93 100644 --- a/sysdeps/nacl/xstat.c +++ b/sysdeps/nacl/xstat.c @@ -35,7 +35,7 @@ int __xstat (int vers, const char *file, struct stat *buf) { nacl_abi_stat_t abi_buf; - return NACL_CALL (__nacl_irt_filename.stat (file, &abi_buf), + return NACL_CALL (__nacl_irt_dev_filename.stat (file, &abi_buf), __xstat_conv (vers, &abi_buf, buf)); } hidden_def (__xstat)