From patchwork Mon Jan 29 22:00:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 867326 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-89805-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="CA8MkrJv"; 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 3zVk551Dpkz9s71 for ; Tue, 30 Jan 2018 09:02:16 +1100 (AEDT) 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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=ZNTRKvLPiFpoBK9BFCRA0acCdTbaDDw uyOXpp1lorbbFWUs4TA0l6qUSdYm+xmERAFccrP+W0nTlqoCx1d8aPD+Hr1iKnlq fMBDtgLN3TDo//xAgeFJvKOwM7ri+4c3fxBgNvQYDyRnzDzXyG2t0gMkWWyjhB87 lQSFU/3IIymU= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=VDVFEmxnJ8NDGvRoFyvfoOkFXgs=; b=CA8Mk rJvHe5Rrg0+TobT68SGNK4pCGZlQ6vaPPlk6U6vaQ7lwhHQImsaB9GRjzaR/1MEh Ixt80iopEhAeiIlEFFqUmaEQp+kiT+q+UgjtvC272uILmcL/kOBo+kzgDuR+ZUa/ XL754spTGbx7cvM+7+1i6uWYKzjbohFqR3NVCg= Received: (qmail 50648 invoked by alias); 29 Jan 2018 22:01:57 -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 50484 invoked by uid 89); 29 Jan 2018 22:01:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL, UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy=UD:libutil.abilist, libutilabilist, libutil.abilist X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited 4/6] libio: Rename _FWRITE to FWRITE_FUNC Date: Mon, 29 Jan 2018 23:00:46 +0100 Message-Id: <20180129220048.28097-5-samuel.thibault@ens-lyon.org> In-Reply-To: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> References: <20180129220048.28097-1-samuel.thibault@ens-lyon.org> _FWRITE would be in the reserved-namespace. * libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC. (do_test_bz20181): Rename accordingly. --- ChangeLog | 2 ++ libio/tst-memstream3.c | 10 +++++----- libio/tst-wmemstream3.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 476cb73847..2694f6d363 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,8 @@ * sysdeps/mach/hurd/i386/libutil.abilist: New file. * sysdeps/pthread/allocalim.h (__libc_use_alloca): Commute operands of || to respect codestyle. + * libio/tst-memstream3.c (_FWRITE): Rename to FWRITE_FUNC. + (do_test_bz20181): Rename accordingly. 2018-01-29 Darius Rad diff --git a/libio/tst-memstream3.c b/libio/tst-memstream3.c index df0da5bac5..bb3300dc57 100644 --- a/libio/tst-memstream3.c +++ b/libio/tst-memstream3.c @@ -29,7 +29,7 @@ # define W(o) o # define OPEN_MEMSTREAM open_memstream # define PRINTF printf -# define _FWRITE fwrite +# define FWRITE_FUNC fwrite # define FPUTC fputc # define STRCMP strcmp #endif @@ -114,14 +114,14 @@ do_test_bz20181 (void) if (fp == NULL) ERROR_RET1 ("%s failed\n", S(OPEN_MEMSTREAM)); - if ((ret = _FWRITE (W("abc"), 1, 3, fp)) != 3) - ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); + if ((ret = FWRITE_FUNC (W("abc"), 1, 3, fp)) != 3) + ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno); if (fseek (fp, 0, SEEK_SET) != 0) ERROR_RET1 ("fseek failed (errno = %d)\n", errno); - if (_FWRITE (W("z"), 1, 1, fp) != 1) - ERROR_RET1 ("%s failed (errno = %d)\n", S(_FWRITE), errno); + if (FWRITE_FUNC (W("z"), 1, 1, fp) != 1) + ERROR_RET1 ("%s failed (errno = %d)\n", S(FWRITE_FUNC), errno); if (fflush (fp) != 0) ERROR_RET1 ("fflush failed (errno = %d)\n", errno); diff --git a/libio/tst-wmemstream3.c b/libio/tst-wmemstream3.c index 4edc2b9094..f24f0facc6 100644 --- a/libio/tst-wmemstream3.c +++ b/libio/tst-wmemstream3.c @@ -37,7 +37,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq) #define W(o) L##o #define OPEN_MEMSTREAM open_wmemstream #define PRINTF wprintf -#define _FWRITE fwwrite +#define FWRITE_FUNC fwwrite #define FPUTC fputwc #define STRCMP wcscmp