From mboxrd@z Thu Jan 1 00:00:00 1970 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 190B9EEB59D for ; Thu, 12 Sep 2024 19:20:28 +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:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+iuA/k6MmH22dFXle1CRzYPD4zES+8NYgaA+BLeffOE=; b=wR1MClGq3u2ikb/9hgvXVDedvI Kjn2oCfRmdYcOetELDSrKsGGMC2BtQguFcAl9TqYplo8BOE4882ctv2CSZN74qQCAmaBRaNCkWYrP Lr1icbUhiFYvG9pqZ4Q5NWf1/owZzDn2RRYu0uGxXfs5hM4XVg+zrVk4sW+KcdpDLes4oM6bVX+La aDc3ppcE/tXpj+pS0YbHCRCTnZTtjszPdmcZptNkATrpJMFeJ5FIzkVUap6j5yyCgRv7MbJFNYjjv zrMMOzVn6i3ZKPhTZAxoepw3jGMrrJgIp9vrsXQh3wp1UbPmKrRqkh6z3wsfS4GQYLJbcOh2cy37b DaCQudhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sopMZ-0000000E3se-0eAX; Thu, 12 Sep 2024 19:20:19 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sopLG-0000000E3VJ-24C6 for linux-arm-kernel@lists.infradead.org; Thu, 12 Sep 2024 19:18:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 87CBA5C5C2B; Thu, 12 Sep 2024 19:18:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E942C4CEC6; Thu, 12 Sep 2024 19:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726168736; bh=6VvmHk310H2pDM3uIfZd+otM8qPMdy6gwUmX7kT0Hkg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=c/IKxY217iyVi5tdaS/n1i197pc4ox5J9FYqB89rtglw/I/3ZjIsOnus1+ZOBTCMe vSc8ggTPT182Ve84h63EHiXBpe+hOo8+3WYDAZzBW/9cK4V7nJRTPyixKy4Qf9SmHh SvodvKpsptYD4FquxQdas4SWsNn2wyywR9tvPQ6fJ/yuRFBI9BXZfAbwhy0UObOcxD iG1ca7KSk4CNdJDI4vqultZtZj2qFFghzSsFw2ltwERpbyVeiCcwaRsheGWz7lLJ5b xss6qSU/JXLiElPSrNGPfyH7afI9MTIECj2CsbUm95EARuMzdU/wH8eiqE/GMEZy7L YtmFiHfkftGpQ== Date: Thu, 12 Sep 2024 16:18:53 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ravi Bangoria , Weilin Wang , Jing Zhang , Xu Yang , Sandipan Das , Benjamin Gray , Athira Jajeev , Howard Chu , Dominique Martinet , Yang Jihong , Colin Ian King , Veronika Molnarova , "Dr. David Alan Gilbert" , Oliver Upton , Changbin Du , Ze Gao , Andi Kleen , =?iso-8859-1?Q?Cl=E9ment?= Le 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 Subject: Re: [PATCH v2 01/13] perf pmu: Simplify an asprintf error message Message-ID: References: <20240912190341.919229-1-irogers@google.com> <20240912190341.919229-2-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240912190341.919229-2-irogers@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240912_121858_642979_C359435A X-CRM114-Status: GOOD ( 17.58 ) 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 On Thu, Sep 12, 2024 at 12:03:28PM -0700, Ian Rogers wrote: > Use ifs rather than ?: to avoid a large compound statement. Cherry picked this one. - Arnaldo > Signed-off-by: Ian Rogers > --- > 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 61bdda01a05a..779db2ac06f0 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; > } > /* > -- > 2.46.0.662.g92d0881bb0-goog >