From patchwork Fri Jan 11 04:46:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TAMUKI Shoichi X-Patchwork-Id: 1023381 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-99168-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linet.gr.jp Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Ha8qf0B9"; 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 43bVhf15jFz9s7h for ; Fri, 11 Jan 2019 15:47:13 +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:message-id:from:date:to:subject:mime-version :content-type; q=dns; s=default; b=s1bQ0pymTpTFegBTnmk+YLGKdRmM8 54P2KtinmicEGwzrD47h5YoMV1cNrR8HdvJTP9yj7hrc/2jxBKxdlC/Q4KKhzPIh YNlF+WDFTo71CXMI1hLQesOkD8abVeNXFXk29uYFvl1u/rYAWggIG59Jh0dIQncm 1NJZmnUI2xukMo= 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:message-id:from:date:to:subject:mime-version :content-type; s=default; bh=faRkIyRghlGAytLqBY49ouuq9SY=; b=Ha8 qf0B9NrZHzZjzNBjXZVpOUk7NMwwj8GzIUUwonkr8ZSBzFptf2BEZtpHBIak23xr RxUTrMmb7d5dtquXFjuqH6V1zCo67qTopHDwqHMQhUf9lPeu88Agj7PILZY0sT+l Vf9Hb1E6M4WnJqfcIzgzJTTgaZsOXbNZrh1f8jgE= Received: (qmail 61544 invoked by alias); 11 Jan 2019 04:47:07 -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 61527 invoked by uid 89); 11 Jan 2019 04:47:07 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy=H*x:Version, Hx-languages-length:1399 X-HELO: mail.linet.jp Message-Id: <201901110446.AA04172@tamuki.linet.gr.jp> From: TAMUKI Shoichi Date: Fri, 11 Jan 2019 13:46:40 +0900 To: libc-alpha@sourceware.org Subject: [PATCH v6] strftime: Consequently use the "L_" macro with character literals MIME-Version: 1.0 Make unrelated changes for the consistency. ChangeLog: * time/strftime_l.c (__strftime_internal): Use "L_" macros, also add a missing space after the cast of "_NL_CURRENT". --- time/strftime_l.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/time/strftime_l.c b/time/strftime_l.c index 6919749c630..7ba4179de3e 100644 --- a/time/strftime_l.c +++ b/time/strftime_l.c @@ -820,7 +820,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, if (modifier == L_('O')) goto bad_format; #ifdef _NL_CURRENT - if (! (modifier == 'E' + if (! (modifier == L_('E') && (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_D_T_FMT))) @@ -917,7 +917,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, #ifdef _NL_CURRENT if (! (modifier == L_('E') && (*(subfmt = - (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT))) + (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_D_FMT))) != L_('\0')))) subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT)); goto subformat; @@ -1262,7 +1262,7 @@ __strftime_internal (CHAR_T *s, size_t maxsize, const CHAR_T *format, DO_NUMBER (1, tp->tm_wday); case L_('Y'): - if (modifier == 'E') + if (modifier == L_('E')) { #if HAVE_STRUCT_ERA_ENTRY struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG);