From patchwork Sun Oct 15 21:23:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 23581 Received: (qmail 25370 invoked by alias); 15 Oct 2017 21:23:40 -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 25361 invoked by uid 89); 15 Oct 2017 21:23:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f175.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:organization:message-id:date :user-agent:mime-version:content-language; bh=S0tAaNoN1OMawFt5IZDVu/KbipPm9a0aftN2s6xGtgo=; b=pVcIvwt7VrEd8fklcUIAaFtxyS5uJCItnfLeA69IfHcamr1C79yp6X3/gcnNbpIThc ZUdgkfaaa350tVSNrPkUegXyrx0tHzK4zivVQDnr+WIJmTmvXBlPWT55+XFSO1bre8I0 90/lX5CnqPCDqrPxKoqTQLvXDlt3IZLqo8UJtT9uUjefCi2bczk43it6FIu66NvUeEvM qNRd2EjLGvi1fdLVLvmPs1vj9Jky9zSA8KzofPI4xW8sfADFVrBH6AUAuNnP/cQeV4pC 3MhkG3p2clBtmC7F8V9g2zBnfbyYjN0+1dEQPQgxIrKrySjiGCtNjQAZRbr1R0TjEXC1 RAjg== X-Gm-Message-State: AMCzsaV4pSBoVj6dtACyZqkgvAeNO9zcSt/H0JP1Ujjr41q6Xf2dT5UO AGiV9cUfFTPrIPovyCexOwb5qij36OI= X-Google-Smtp-Source: ABhQp+SyXboirbZFDWxCuZK2et9pANFSGC4C5K9GE3j0HwhU4NNErx0GXnKo2z4mSlUjEnyBPvfeug== X-Received: by 10.55.106.132 with SMTP id f126mr10482697qkc.295.1508102616434; Sun, 15 Oct 2017 14:23:36 -0700 (PDT) To: GNU C Library From: Carlos O'Donell Subject: [committed] locale: Don't use \n with record_verbose messages. Message-ID: <7b7a44f6-e321-2f65-1ec0-f29afd466d76@redhat.com> Date: Sun, 15 Oct 2017 14:23:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 I missed 3 instances where record_verbose output an extra \n, but in record_verbose we already output \n, so this makes the verbose output have \n\n, which doesn't look nice. Signed-off-by: Carlos O'Donell 2017-10-15 Carlos O'Donell * localedata/collate-test.c (allocate_arrays): Don't use \n in record_verbose messages. From 0b054e37a906c766ff746d44ade5d0dacdecadd9 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Sat, 14 Oct 2017 15:38:05 -0700 Subject: [PATCH] locale: Don't use \n with record_verbose messages. Recorded verbose messages no longer need to pass \n in their message string since the record_verbose function adds \n to the messages (like error and warnings do also). The avoids seeing a double \n for verbose messages. --- ChangeLog | 5 +++++ locale/programs/ld-ctype.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eed7450..e09dfdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-10-15 Carlos O'Donell + + * localedata/collate-test.c (allocate_arrays): Don't use \n in + record_verbose messages. + 2017-10-14 H.J. Lu * Makeconfig (+link-static-before-libc): Use the first of diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 251e7a7..afb431b 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -3667,7 +3667,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, wctype_table_add (t, ctype->charnames[idx]); record_verbose (stderr, _("\ -%s: table for class \"%s\": %lu bytes\n"), +%s: table for class \"%s\": %lu bytes"), "LC_CTYPE", ctype->classnames[nr], (unsigned long int) t->result_size); } @@ -3731,7 +3731,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, ctype->map_collection[nr][idx]); record_verbose (stderr, _("\ -%s: table for map \"%s\": %lu bytes\n"), +%s: table for map \"%s\": %lu bytes"), "LC_CTYPE", ctype->mapnames[nr], (unsigned long int) t->result_size); } @@ -3854,7 +3854,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap, /* Set the width of L'\0' to 0. */ wcwidth_table_add (t, 0, 0); - record_verbose (stderr, _("%s: table for width: %lu bytes\n"), + record_verbose (stderr, _("%s: table for width: %lu bytes"), "LC_CTYPE", (unsigned long int) t->result_size); } -- 2.9.5