From patchwork Thu Aug 8 14:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cai via GitGitGadget X-Patchwork-Id: 11084249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 826D214E5 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7190228644 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65EC128B1C; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11DA028644 for ; Thu, 8 Aug 2019 14:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403855AbfHHOTH (ORCPT ); Thu, 8 Aug 2019 10:19:07 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:35147 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403816AbfHHOTF (ORCPT ); Thu, 8 Aug 2019 10:19:05 -0400 Received: by mail-wr1-f65.google.com with SMTP id k2so9265200wrq.2 for ; Thu, 08 Aug 2019 07:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=DFKO2Y6RdYqqFC92luOo3NuQfAXk9PB9nYMaKON8O0M=; b=MVj71Ba7jiaYLwWL8b/i3H/fjfK5aj2ARGxyi1HphMhD18Z7UUAWBYAf0Bg//2eMx2 b1gob+z7/KmwhfVy1AhVI5f1pPgwVMM61ZHwV1zFPl2sEJu+x/3Bfvgr15aZwAJiwmAG X3PJjUBb5LKrk3JwZYVJf4dyNXDbotmrt2lNdwZP0QBy9UIvB2MmY85/gdurGR9nBlLc jlxEgiqynUv3RZTBEx+jWG5ur3K3o+aMfYP107tyrCPQRj5YY9jafs7HpEgzBAf9Yynx /IHHobvRcxKCGHai4IZokRbq7shhFB0a5Uh+MFa+MbSo70cyrsYzSYZX9UV/XYtkW2ue BJtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=DFKO2Y6RdYqqFC92luOo3NuQfAXk9PB9nYMaKON8O0M=; b=m29dGsXlUafnbT4BirVDOJQZjveAXZKbFSR4K7cwGoGs0r+3KxQv7AxoddI/U7pMdu O2CRC+q5aX9cI7lFNDmUrSMsXKeuoF1+2N+CbqRSPjVAJ9caiu0gG1vMCauy3y+01bDp ZCbuTfS9ymSNVBiWXpnJFr1iJEQNAvm6eedSzVHFBhCVZiWT0GC57oWzBubXCIPdSPik J/1GTIpr3MJ8QZkOOEtYOOW648BFGODhNRSxqhgJpFHa6SS2kcP5JXZQrs8SMUz5AbJw mdA5WXE4FesC0dTKhBLjY0pZH/nlGs7q+Y7hp5MBhIHFNu0+4Azo8lF5eLeLGbGpQPVX BhUQ== X-Gm-Message-State: APjAAAXcugbpfEPCXNQdr7SfeR6tAy9/mAol6GJc4M64g4+Iuf7UN6vV EkG1YW/bnP77A8LuC2ZQowYbDDJp X-Google-Smtp-Source: APXvYqzm3GrdJesA5Gs6TO886SJxeoP6h2kU1WmxC2YVqOJBSdoa4Ale/7qOD/HUw3YZ6hTXPbXqSw== X-Received: by 2002:a5d:4e90:: with SMTP id e16mr17236927wru.339.1565273942694; Thu, 08 Aug 2019 07:19:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l2sm2273125wmj.4.2019.08.08.07.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 07:19:02 -0700 (PDT) Date: Thu, 08 Aug 2019 07:19:02 -0700 (PDT) X-Google-Original-Date: Thu, 08 Aug 2019 14:18:55 GMT Message-Id: In-Reply-To: References: From: "Jeff Hostetler via GitGitGadget" Subject: [PATCH v2 4/7] trace2: trim trailing whitespace in normal format error message Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Jeff Hostetler Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Hostetler Avoid creating unnecessary trailing whitespace in normal target format error messages when the message is omitted. Signed-off-by: Jeff Hostetler --- trace2/tr2_tgt_normal.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 47a1882557..213724d5cb 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -142,8 +142,11 @@ static void fn_error_va_fl(const char *file, int line, const char *fmt, { struct strbuf buf_payload = STRBUF_INIT; - strbuf_addstr(&buf_payload, "error "); - maybe_append_string_va(&buf_payload, fmt, ap); + strbuf_addstr(&buf_payload, "error"); + if (fmt && *fmt) { + strbuf_addch(&buf_payload, ' '); + maybe_append_string_va(&buf_payload, fmt, ap); + } normal_io_write_fl(file, line, &buf_payload); strbuf_release(&buf_payload); }