From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f52.google.com (mail-dl1-f52.google.com [74.125.82.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 313B519EED3 for ; Sat, 9 May 2026 18:02:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778349723; cv=none; b=Xos57C9QPG5NOLz1084Sx3K2MP9QZsMujJHpMTfeRKMShUdwhNeTfQK5c04+OMzPZOGpizgbrUUyV8Lwc5c7RwNCnedLbFcwGdAeDN4+0xT1jrZyc2mwSdHYf4o7+7B5qQ6xrGJmINgscT58euGakR3QKvKA9buJ8uYmAonWZ4Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778349723; c=relaxed/simple; bh=xy2xQtFBhBe20zXsyaDDMgkkf5Ehk5fiICI0JvFKS4s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e4r5s7R0gw+za4lQJO9RWSZtvLEmNHTFhdwhuTY6OJHtRR1tS5nyfvJjYBAgYLASGWiIHnvfZAAAx6Li99aKvCp5I1rnwL+A4qzrJpvkHE5CuSJp1TXkXh7wL2j4ZqbbZYwjWI8GBuaMuupc99B3dULU+p/eOLNi5GalamwTSpw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hSnaGPA3; arc=none smtp.client-ip=74.125.82.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hSnaGPA3" Received: by mail-dl1-f52.google.com with SMTP id a92af1059eb24-12c19d23b19so5264822c88.0 for ; Sat, 09 May 2026 11:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778349721; x=1778954521; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tzmsdzRWzePXCMV/JpASG0u6Okws5AuRCWceX1TYKyc=; b=hSnaGPA3i1zIsZQ3keq1p8BpBWY0ElX1CnyhvHjUiMulWoyRCmNcFVK8A7spajves9 NPw5nnMpbbkSoscRnPPua/BXG7bCQlorycDRtaDWg/yd+5GiyI+ydW6hSPvF/I1ums4Y P9n4IeszQH4tUcP9JkL2VFN2LxoBaGArcCFKPURJuBSdMc1MjNcApWXkG6+seLZpDA2/ 1kCIWwUZgmXf0IYmhFk2hw9Q5DTzPGpsj2T+9K7ovkVSovk8yn0Fp+brR1RvHpv1QhHG D8UnPDjtF2H8PtkkzPtf+/nmwA8rZgh6nQtD+EaGCsdT3I3cVSGVR03yPUGt9w1LMyFf Q9hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778349721; x=1778954521; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tzmsdzRWzePXCMV/JpASG0u6Okws5AuRCWceX1TYKyc=; b=UqVWHrovaF5pGMI0OvJuT1XtqoehP629tfyeg2nX862QgfeULRcvU5QK2olsMfe3hD tEir3atdlWvg4ygPyO8XDQr+Y81JVsdha2yw2bBJsXn2gEw7DT8Ot26cJtSSLvvumB3C AnUZFczbEVDF5o4WwRYq9jUw/pS2S9s59RUI7kEw7xpcvdvGmpP+FQuS9yzqJi/YAbF2 6X6oJKHE7Z45PdjooYr5rGjKdDCjbFPHi4MMCTxqJar/69zalr4v5AviO6dKDTX6Ul2j ktVH+6qssijiadSg33f3zKjtICDhIbqmlrfyYREzqpN0zOqnBJKrWZfOEB1BuUnCQYHV y58g== X-Forwarded-Encrypted: i=1; AFNElJ/tHdQ7saGolsJxvVFpYsjA/BGlZ4aKoMJOn//nTtX63KFGOQlBtFzY0mEV6I6hjnTXPhB7axoWnUjDjVM=@vger.kernel.org X-Gm-Message-State: AOJu0YxOx+NptW4H4QCPhJQaOK/WxPVlIlQVVDrtGP3gnsYYhjNTDE1a UhM2e4o4i9x/miqV7ZGdyv+LaPHkglKmXOXD5MSQTVSxHKm/tl+oNZyC X-Gm-Gg: Acq92OE2O/JaWFiMt+fmNS+SrBRFOFPlFMioNcVhF/2mGH4tbeTnCRfuKrk3zfn/ABq 5zrtlpev1LY6JbkhigAX3bPRnTfCpFpv6ynpCxvqGwxYJWgQSS+5sy/guaHAJhKSSLkh4BqJCbX 1jKxh4QO+rd8m5z4m2ArWCW8cdY1ukH3wc0L9Si7Ur8GkSKUYdmHxYLtdA/Ps0UmcFR+f7uyWeY BmzHF+kLZMtIKhlK7TztEpNhPUmNDPa0tcAVKRW+2VJZVCXKjDculZhG7IwyIE5b+gaN7z7hc2o 1B4ZJtQFah4A0mtJyQnOaMJqI27SZuhqXXp/evm2UFRVceKEqV4IoPZWRp0fNGGOy973BxsIhlV dvPCiD91+SHmZQE/T4xdqXH5gHNIP1DmjlrLgLEGRo96RgQAHM3fCcj1TDRl5nEyxE+DxXpEovN 32Lks7LZKfQZE8sgUbfEPlrIUoiPRIBu1G0vaeBYBL5JbGYeFE9d1bO39p9d46H31rT2Cshx8E X-Received: by 2002:a05:7022:2511:b0:12b:ec15:69d3 with SMTP id a92af1059eb24-1319cc31478mr8821514c88.19.1778349721187; Sat, 09 May 2026 11:02:01 -0700 (PDT) Received: from rawhide.lvn.broadcom.net ([192.19.161.250]) by smtp.googlemail.com with ESMTPSA id a92af1059eb24-1327821fd00sm8979500c88.8.2026.05.09.11.02.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2026 11:02:00 -0700 (PDT) From: Shreenidhi Shedi To: gregkh@linuxfoundation.org, acme@kernel.org, linux@treblig.org, mikhail.v.gavrilov@gmail.com Cc: yesshedi@gmail.com, linux-kernel@vger.kernel.org, Ian Rogers , Arnaldo Carvalho de Melo Subject: [PATCH v1 02/18] perf diff: Constify strchr() return variables Date: Sat, 9 May 2026 23:05:43 +0530 Message-ID: <20260509173559.10999-3-yesshedi@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260509173559.10999-1-yesshedi@gmail.com> References: <20260509173559.10999-1-yesshedi@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnaldo Carvalho de Melo commit f6f41aef53761517391b6192fe5b4bc30b2d717a upstream Newer glibc versions return const char for strchr() when the 's' arg is const, change the return variable to const to match that. Also we don't need to turn that ',' into a '\0', as strtol() will stop in the first invalid char. No need to touch read only memory. First noticed with fedora 44. Reviewed-by: Ian Rogers Link: https://lore.kernel.org/r/20251211221756.96294-3-acme@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Shreenidhi Shedi --- tools/perf/builtin-diff.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c index ed07cc6cca56..9a05d67f541b 100644 --- a/tools/perf/builtin-diff.c +++ b/tools/perf/builtin-diff.c @@ -177,10 +177,9 @@ static struct header_column { } }; -static int setup_compute_opt_wdiff(char *opt) +static int setup_compute_opt_wdiff(const char *opt) { - char *w1_str = opt; - char *w2_str; + const char *w1_str = opt, *w2_str; int ret = -EINVAL; @@ -191,8 +190,7 @@ static int setup_compute_opt_wdiff(char *opt) if (!w2_str) goto out; - *w2_str++ = 0x0; - if (!*w2_str) + if (!*++w2_str) goto out; compute_wdiff_w1 = strtol(w1_str, NULL, 10); @@ -213,7 +211,7 @@ static int setup_compute_opt_wdiff(char *opt) return ret; } -static int setup_compute_opt(char *opt) +static int setup_compute_opt(const char *opt) { if (compute == COMPUTE_WEIGHTED_DIFF) return setup_compute_opt_wdiff(opt); @@ -233,7 +231,7 @@ static int setup_compute(const struct option *opt, const char *str, char *cstr = (char *) str; char buf[50]; unsigned i; - char *option; + const char *option; if (!str) { *cp = COMPUTE_DELTA; -- 2.54.0