From patchwork Wed May 15 12:31:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raymond Mao X-Patchwork-Id: 1935580 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=bRaQD+J3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VfXhg1FQ0z1ymw for ; Wed, 15 May 2024 22:33:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C08DD882DC; Wed, 15 May 2024 14:33:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="bRaQD+J3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D01A882DF; Wed, 15 May 2024 14:33:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4D296882D6 for ; Wed, 15 May 2024 14:33:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=raymond.mao@linaro.org Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-34da35cd01cso6290164f8f.2 for ; Wed, 15 May 2024 05:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715776428; x=1716381228; darn=lists.denx.de; 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=pZB2WN9KCVMfZyYoPhNQjP2Md9H0Pbuq/IK8CBvwCCE=; b=bRaQD+J3aTvWtKIE0m7GfBEd1by5NWI2DrCyLn5Xk0cRrEcv62jFqL6+P3cTi8r3gd W7apueIwFv+6SFcJLxLZCflRWRFzoKb0Cc6+1m4SnupzHjiCNOreuKyC5JliQ+ANV461 UEVKwlSIjXourY3AIOIFMMmttpeXWlvpqD3UjzQrRXVhkYGlOp45wq7WdxRKNHKZC07F 4KJiU710ANTqIAWMAug+AP5irOYHgWQhMAbzgYmN5ZvDQM3knTfZCFjTuUDQKjyImKTZ GjASEM2bcXjg/7pwNYDGsi8Ibd3L2UjWl3FR35jVEvzQMVwoMc8Fx81TQXrETkyLSkBM JyhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715776428; x=1716381228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pZB2WN9KCVMfZyYoPhNQjP2Md9H0Pbuq/IK8CBvwCCE=; b=EHS9ssIKUjrwje67p5ZurC4wI3cQ41QbW2CAwbdtJMqi4bS3RmHztM3T5AKyL1l2tQ Zjuk8xpKgAa15NEMH2Yr88QnUnRBh3IzMOAuFCU5pdO/8udq9esJ3TA4kf8UBe1vSIqU gehsU33CUqR+ApfEGhpPVc4lBCkilr44PaN6+JKO2oILc852AnhEPO4F9fQov5GRwoXZ RGcc3JBDtGxroDcHhgk8K7galfl5rcJAuUtQXqY7N5I0zz883QtNQQUPybNgj6De88kK LuvRZ0+vb+hjJU/AjM0aGGKYM0HvNMwJxcy6L7ibKHrGPGUhX3rhOoQB+IYQlhNf0sSe LRzg== X-Gm-Message-State: AOJu0YzGI7mQbRrFot/yG70drJZ0UbCdqlZuGmn+2D7+6uES4cXxdY2t J023SsXWmEkpBINZVnlqhPhaUy+yRXqgUyyw8DLXaIY29jKFbkS0or/L0fd1TrYZxEGwK4nx4Os K X-Google-Smtp-Source: AGHT+IE01AJZ15v7kp/NN+htPOtmHcuF6XUP1LeqDOobFYwZx8fdOGy/d19t/cG5rZDb5cr/b13JRA== X-Received: by 2002:a5d:68cd:0:b0:34d:83cf:dc56 with SMTP id ffacd0b85a97d-3504a73752cmr14036187f8f.24.1715776428556; Wed, 15 May 2024 05:33:48 -0700 (PDT) Received: from ubuntu.localdomain ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baad042sm16406896f8f.80.2024.05.15.05.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 05:33:48 -0700 (PDT) From: Raymond Mao To: u-boot@lists.denx.de Cc: Raymond Mao , Alexey Brodkin , Eugeniy Paltsev , Tom Rini , Tony Dinh , Phil Sutter , Walter Schweizer , Mario Six , Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Nishanth Menon , Roger Quadros , Jonathan Humphreys , Igor Opaniuk , Marek Vasut , Bin Meng , Caleb Connolly , Masahisa Kojima , Eddie James , Jassi Brar , Michal Simek , Masami Hiramatsu , AKASHI Takahiro , Etienne Carriere , uboot-snps-arc@synopsys.com Subject: [PATCH v2 4/4] include: Move snprintf to stdio.h Date: Wed, 15 May 2024 05:31:59 -0700 Message-Id: <20240515123213.1701691-5-raymond.mao@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240515123213.1701691-1-raymond.mao@linaro.org> References: <20240515123213.1701691-1-raymond.mao@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Move snprintf to stdio.h since it is needed by exteranl libraries. Signed-off-by: Raymond Mao --- Changes in v2 - New patch. arch/arc/lib/cpu.c | 2 +- board/Synology/common/legacy.c | 1 + board/ti/common/fdt_ops.c | 2 +- cmd/part.c | 2 +- common/button_cmd.c | 2 +- drivers/cpu/mpc83xx_cpu.c | 2 +- include/stdio.h | 1 + include/vsprintf.h | 17 ----------------- lib/display_options.c | 1 + lib/fwu_updates/fwu_mtd.c | 2 +- lib/hexdump.c | 2 +- lib/vsprintf.c | 1 + test/dm/scmi.c | 2 +- test/print_ut.c | 1 + 14 files changed, 13 insertions(+), 25 deletions(-) diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 593950449f2..269b4dbdd15 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/board/Synology/common/legacy.c b/board/Synology/common/legacy.c index a0bace7b46c..2e3aa660eaa 100644 --- a/board/Synology/common/legacy.c +++ b/board/Synology/common/legacy.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/board/ti/common/fdt_ops.c b/board/ti/common/fdt_ops.c index eb917be9e0d..8a3300993ed 100644 --- a/board/ti/common/fdt_ops.c +++ b/board/ti/common/fdt_ops.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include "fdt_ops.h" void ti_set_fdt_env(const char *board_name, struct ti_fdt_map *fdt_map) diff --git a/cmd/part.c b/cmd/part.c index c75f85acd52..b1c06064ad5 100644 --- a/cmd/part.c +++ b/cmd/part.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include enum cmd_part_info { CMD_PART_INFO_START = 0, diff --git a/common/button_cmd.c b/common/button_cmd.c index 8642c26735c..72dac1f9ef6 100644 --- a/common/button_cmd.c +++ b/common/button_cmd.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include /* Some sane limit "just in case" */ #define MAX_BTN_CMDS 32 diff --git a/drivers/cpu/mpc83xx_cpu.c b/drivers/cpu/mpc83xx_cpu.c index e451c11116a..5b2d0485258 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "mpc83xx_cpu.h" diff --git a/include/stdio.h b/include/stdio.h index 3241e2d493f..ecd0f996efb 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -45,6 +45,7 @@ static inline int vprintf(const char *fmt, va_list args) return 0; } #endif +int snprintf(char *buf, size_t size, const char *fmt, ...); /* * FILE based functions (can only be used AFTER relocation!) diff --git a/include/vsprintf.h b/include/vsprintf.h index ed8a060ee17..fe951471426 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -218,23 +218,6 @@ char *simple_itoa(ulong val); */ char *simple_xtoa(ulong num); -/** - * Format a string and place it in a buffer - * - * @buf: The buffer to place the result into - * @size: The size of the buffer, including the trailing null space - * @fmt: The format string to use - * @...: Arguments for the format string - * Return: the number of characters which would be - * generated for the given input, excluding the trailing null, - * as per ISO C99. If the return is greater than or equal to - * @size, the resulting string is truncated. - * - * See the vsprintf() documentation for format string extensions over C99. - */ -int snprintf(char *buf, size_t size, const char *fmt, ...) - __attribute__ ((format (__printf__, 3, 4))); - /** * Format a string and place it in a buffer * diff --git a/lib/display_options.c b/lib/display_options.c index d6b93553dcb..d5df53ab15f 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -12,6 +12,7 @@ #include #include #include +#include #include char *display_options_get_banner_priv(bool newlines, const char *build_tag, diff --git a/lib/fwu_updates/fwu_mtd.c b/lib/fwu_updates/fwu_mtd.c index 69cd3d7001f..4a52834b61a 100644 --- a/lib/fwu_updates/fwu_mtd.c +++ b/lib/fwu_updates/fwu_mtd.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include diff --git a/lib/hexdump.c b/lib/hexdump.c index 33e3e6e5182..2bc508ff504 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 27ea9c907a3..cfd1f1914ed 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include diff --git a/test/dm/scmi.c b/test/dm/scmi.c index adf36ffaab1..a03824ab653 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/print_ut.c b/test/print_ut.c index bb844d2542b..a0d6a551203 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include