From patchwork Wed Oct 2 03:20:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13819278 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7A2A2CF318F for ; Wed, 2 Oct 2024 03:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:To:From:Subject :References:Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mlqVBWAOpVfJanfv4s+m+V064r/fmGnZe909uVEp74Q=; b=Fz24/vt7LS0NPBFXhPrJUXmc3v L410UFJ23baafdsxCM4KhI4bb827dbvte8/cZlnlQ49qRgBN6s+p6rXaRm+n+eRp8oaHFJFdmVhfq bokUbjOZa1XjC/mAtOmBHC1bCZ7x7ZXJA4vHRmNB3zE40yHo4teaad3+4wk1930ewwm9EQK3eAp3y sm91EZOaGBIP7Sy7bxqGWVic9VkpyPk5vc6C2ELgr0RKpcGumCm9d0vjg2rJiqI1HtVtxok3lkAk1 ppoD+/CkVl5WmDOcXQ13sKZ84IsFJCAtgZ7Y7u/s1KbTMTSTX0PASLvyh+glDJwpH0p/nBVWgByBm Q4lnZaXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1svpx3-00000004gb5-1VpB; Wed, 02 Oct 2024 03:22:57 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1svpuc-00000004g15-1CEx for linux-arm-kernel@lists.infradead.org; Wed, 02 Oct 2024 03:20:27 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-6e251ba2243so6141597b3.1 for ; Tue, 01 Oct 2024 20:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727839225; x=1728444025; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=mlqVBWAOpVfJanfv4s+m+V064r/fmGnZe909uVEp74Q=; b=1gU73kIwv8mcUCD7MaDA046IcVubQoovR8tU2BOHi5xcupNh1f0tT8+Awgt0RD2qvn dKf8hUCZEPosFdbh1CI2vsU17l0Rj/UI9n/YM2dw/DClzBqQRIU8IkKTB8K7uI8JoNwU C7qsWa/a0QsvFGPUYl/yleYSBYrOF8P7wurIGvhy3So7BdYmm8b6mSmxHOs2J5Aj6Zlt tuUVmlR/LjRcSStqmyYP2lobmgljUWirxvYLVQEd2w58t2wJU9/Yg9aEM4W695s4/B85 ODdIYPjqt7XS0UUS+weSZ98x+zHZwkCL6psbEwOJcm4nHq5mSqtBWMikFB5D9P73H8Wb KMvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727839225; x=1728444025; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mlqVBWAOpVfJanfv4s+m+V064r/fmGnZe909uVEp74Q=; b=K1K1ZmzE1OjBNDyIewHnHftKtzJFeCT1sNqbrIg4ZJ1vLNYzUaMmG4hoPlobUx9HZj LP/pvlxMwgOWNKiSEa5SjvZSoE89j8vOQCMPm6+g9fs+9GzkfLzY97PlExWAVsnGuGQy AJfhxcnlfKiCmr0Tg1vIiOgV+UFjNs9q9CwyDVkV2z2PhOnm458yuCJHaTe8IpXE24KG GYHlLidZ8aR/o/X+JA2vX6AXYj6RUTtcwK9aLPMWRdohvFCL9uV5WQrDMtL0Rf/uoj8g yjHN2XTD5uAe8eDZSvxVh/qN8KWAHXLmpBBm1cSuzmybA04RefsaJqSKZd8T1qGdMb7p C2Zw== X-Forwarded-Encrypted: i=1; AJvYcCV5jQ6EIrSKAXx/BWyQo6eOyhEwzDbYH5tVtQYN3REan6vwtSp4PTfR85f733/eKFdYS2smt55bm/Yvicqor7X+@lists.infradead.org X-Gm-Message-State: AOJu0Yy0a72feVCY/CqTD9W90PVbGE/Y1bmF1KKTdeTBtdKp/bB+mClp UfZJb47fpDwc7PPAYX5Ye88Xbm6H5By9EQYrGY3odgla1dTFBzX9geHTNd2Fe0Xw2nv4KhiJ8PN 1dCfVnQ== X-Google-Smtp-Source: AGHT+IGzuGaCwhO4F5RbpJtWD80jojIRLpMbMtUnTcgGgB1r9Jr5pkreMHPYLvjuBmCRnD7/UJ/Wuc0bIOVS X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:ffa1:6d00:2acb:535f]) (user=irogers job=sendgmr) by 2002:a05:690c:64c9:b0:6db:e464:addc with SMTP id 00721157ae682-6e2a34b7328mr410007b3.4.1727839224568; Tue, 01 Oct 2024 20:20:24 -0700 (PDT) Date: Tue, 1 Oct 2024 20:20:04 -0700 In-Reply-To: <20241002032016.333748-1-irogers@google.com> Message-Id: <20241002032016.333748-2-irogers@google.com> Mime-Version: 1.0 References: <20241002032016.333748-1-irogers@google.com> X-Mailer: git-send-email 2.46.1.824.gd892dcdcdd-goog Subject: [PATCH v3 01/13] perf pmu: Simplify an asprintf error message From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Weilin Wang , Ravi Bangoria , Sandipan Das , Xu Yang , Benjamin Gray , Athira Jajeev , Howard Chu , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , "Steinar H. Gunderson" , Ze Gao , Dominique Martinet , " =?utf-8?q?Cl=C3=A9ment_Le_?= =?utf-8?q?Goffic?= " , Sun Haiyong , Junhao He , Tiezhu Yang , Yicong Yang , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241001_202026_347257_D7C04774 X-CRM114-Status: GOOD ( 13.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use ifs rather than ?: to avoid a large compound statement. Signed-off-by: Ian Rogers Acked-by: Namhyung Kim --- tools/perf/util/pmu.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 8993b5853687..cb2eb2407de5 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1466,13 +1466,12 @@ static int pmu_config_term(const struct perf_pmu *pmu, if (err) { char *err_str; - parse_events_error__handle(err, term->err_val, - asprintf(&err_str, - "value too big for format (%s), maximum is %llu", - format->name, (unsigned long long)max_val) < 0 - ? strdup("value too big for format") - : err_str, - NULL); + if (asprintf(&err_str, + "value too big for format (%s), maximum is %llu", + format->name, (unsigned long long)max_val) < 0) { + err_str = strdup("value too big for format"); + } + parse_events_error__handle(err, term->err_val, err_str, /*help=*/NULL); return -EINVAL; } /*