From patchwork Mon Feb 26 02:11:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 776002 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (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 2B9641078B for ; Mon, 26 Feb 2024 02:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708913518; cv=none; b=sV0s1cf4ZHmG3mVA+zEPqZzVl7C/6aTHPUiGAbzXgduWX//xXPU8tx12Fksm/w5Jz9vMygRRs5Casy0TmNb61T1uSiNxoaUhRrumD/pykwm+rXFxvQG0kH6QRpG2NVoQxKJadOA9dpsI/ssmPhPG0rhSElYgLkmNzeOfEhC8kwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708913518; c=relaxed/simple; bh=jZfVAAcDxjvKB0VY8B3YaZ+uO2w0uEao68eTQKvjiw0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ImHTIlDnFddEaOvYXcVxt1vbFn+ZGEEWNVm6jQJNRRRp6eVfwGfiB7PimDjOyei50WcE3iz87Kaoe2vLtgkpaWaJKpWlCEjGU+p7AsoyfMamvQNHghg/Wls8CnBPi7CqJzp+9CayDI91WPshkk2x8sBVIzFpGw6z8T8OxXynu3Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=jTK7GlPN; arc=none smtp.client-ip=209.85.208.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="jTK7GlPN" Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2d27184197cso29824101fa.1 for ; Sun, 25 Feb 2024 18:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708913513; x=1709518313; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=B4WJzDolwQAt18vJAoYRdoVVqjnAvhbqXGlG4vWEs3Y=; b=jTK7GlPNZDodkAxLOQnTRxlmR3EKHqnPKDJ2MkVLG8tvAskrgno7okbWPS+nLPZI+6 3JuWEazS74sUVEO/8Ja5l2IYTv0sFnK42mFQsIBrcY3f+vQ2zGByvTdWhEL2OTpSAXbR qAIDGJIRGdICp7SEdR2HOeP5sNSRtKoYbakpsy+CptHRRb2oOLSv+Xicaq7sNOva7A0w HwqrSdq8fPuVfWte9sRyOSIyC9ks/Qjnoh2lhtpsdDPeK+7da5CJ/ShKMMY/QmOxOFIc ByKT+YD/6XR5euJTQa15PMj7eSrzx26NDyoV1DlIKzWb884F65YT2ckvl/40zm1unmRY wZUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708913513; x=1709518313; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B4WJzDolwQAt18vJAoYRdoVVqjnAvhbqXGlG4vWEs3Y=; b=K1zF395gJe0ZIOIJUDEFAnur+RjrGxb2pvTxNQ1EZO22vuUkd4lT67spw+Z/AL1OC/ IS1W+nFqtBU/+8ivX3ej4E3YEsjMXuc/I3Ypw1yE3zrY4+gIkq5i3Sq/oODgyvcW7CWH L5FGz6STSabTpL0PPNiTtyEkS10laE8cwkVxhvL9GgYKo0i5vjuOAdxif+BRmiw4FYOs iFmuDD3xccVS3h1smTRaomNwphRycDwYYeG0HaVj7Ii952P5xw7EXsDJoty1OxswZCsK wFL/M3mZYW5c/OJexA0v7yMW98CFUHjpv26a+hgiPNEZKZhXoGLTVBK3mHifRR/tS8UU Ni3A== X-Forwarded-Encrypted: i=1; AJvYcCW3VwSHD9plwLdyun6LixvKikUiE3YK1MPcYFD7R/S2nkw5OtrVuHlgl0MrMLo6U7M+eVLlDg1QhLbsOGGmuzcvrMhdBl6ZIVht983fhA== X-Gm-Message-State: AOJu0YxkccLjKFmhSi2nIKqA6SH8j4VGlYIlbZ/YuwZE3N9W20UTeGNy MLuflCsRF+pIPgdRE//1pcrGcKqdi2FMWkMF0v5aGsuw//oZHpLbJl447pxIOzbFq/gitYR+ydj S X-Google-Smtp-Source: AGHT+IHIhjygvqwAPNq6G01cvfGh0Xz2bV+AHOCuxJnMV+tOjv30gYslyjwruP3z9HG5pCKzHnIc9w== X-Received: by 2002:a05:6512:2352:b0:512:f628:32b9 with SMTP id p18-20020a056512235200b00512f62832b9mr2204358lfu.27.1708913513426; Sun, 25 Feb 2024 18:11:53 -0800 (PST) Received: from umbar.lan (dzyjmhybhls-s--zn36gy-3.rev.dnainternet.fi. [2001:14ba:a00e:a300:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id m11-20020a056512358b00b00512e39ce472sm676176lfr.175.2024.02.25.18.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 18:11:52 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 26 Feb 2024 04:11:43 +0200 Subject: [PATCH RFC 07/12] drm/msm/headergen: use asprintf instead of custom aprintf Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240226-fd-xml-shipped-v1-7-86bb6c3346d2@linaro.org> References: <20240226-fd-xml-shipped-v1-0-86bb6c3346d2@linaro.org> In-Reply-To: <20240226-fd-xml-shipped-v1-0-86bb6c3346d2@linaro.org> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter Cc: linux-kbuild@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Dmitry Baryshkov X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3089; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=jZfVAAcDxjvKB0VY8B3YaZ+uO2w0uEao68eTQKvjiw0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl2/NhtJZMjKcvl1vvJmmqadrFVvuv6cSSXvf/V iZT9I/HRvGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZdvzYQAKCRCLPIo+Aiko 1TdVB/4rX75OqHP0pic+FcAPiu8AJWgzBPrcNlgqGriLQU68RjcWyfSqT8vjWjJQ0hJFEi1PD+D hT1pS43M0PqiToTLxrZJdJE1RXheoLvG+7nCKJspMiBg+0ALmJ+RSf49AoJyRA8gCmS6bhebATz clq0L088U7EmdDA3O+3bZSXDnDtsy8fWi5vjqu+H1Muw3+8KS+0R2jFDpIQjLuuW1bZ9YLHiOQL hCeXbjMkeftb7dv6WjK2EI9wBhaWdz+9Ssewt673vGkZU3eka/wyfnH9Ppp38YKVDmIROMTFpPw Z9syTfwp2u2AnGSgjcs2yWiaQapH/EB7rjQrVhlZPG6KEFbw X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Replace custom aprintf() function with the standard asprintf(). Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/headergen2/aprintf.c | 38 -------------------------------- drivers/gpu/drm/msm/headergen2/rnn.c | 5 ++++- drivers/gpu/drm/msm/headergen2/util.h | 2 -- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/drivers/gpu/drm/msm/headergen2/aprintf.c b/drivers/gpu/drm/msm/headergen2/aprintf.c deleted file mode 100644 index b3d924f59413..000000000000 --- a/drivers/gpu/drm/msm/headergen2/aprintf.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2009-2011 Marcin Kościelnicki - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "util.h" -#include - -char *aprintf(const char *format, ...) { - va_list va; - va_start(va, format); - size_t sz = vsnprintf(0, 0, format, va); - va_end(va); - char *res = malloc(sz + 1); - va_start(va, format); - vsnprintf(res, sz + 1, format, va); - va_end(va); - return res; -} diff --git a/drivers/gpu/drm/msm/headergen2/rnn.c b/drivers/gpu/drm/msm/headergen2/rnn.c index d82d2a561b02..6cf3c54954bd 100644 --- a/drivers/gpu/drm/msm/headergen2/rnn.c +++ b/drivers/gpu/drm/msm/headergen2/rnn.c @@ -44,9 +44,12 @@ #include "util/u_debug.h" static char *catstr (char *a, char *b) { + char *res; + if (!a) return b; - return aprintf("%s_%s", a, b); + + return asprintf(&res, "%s_%s", a, b) < 0 ? NULL : res; } static int strdiff (const char *a, const char *b) { diff --git a/drivers/gpu/drm/msm/headergen2/util.h b/drivers/gpu/drm/msm/headergen2/util.h index 98a32a34d076..07ad637e4521 100644 --- a/drivers/gpu/drm/msm/headergen2/util.h +++ b/drivers/gpu/drm/msm/headergen2/util.h @@ -110,6 +110,4 @@ struct astr { void print_escaped_astr(FILE *out, struct astr *astr); -char *aprintf(const char *format, ...); - #endif