diff options
author | Raymond Mao <raymond.mao@linaro.org> | 2024-05-16 14:11:52 -0700 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-22 08:55:29 -0600 |
commit | cb73fe9eeae0d71a74eef811b0ba34aaf5513dbe (patch) | |
tree | efb46ac2604f9eccde6e9bc65e1d73dfd8d35854 | |
parent | 0fe031dd722079cd076cc120d45e1711eb108fe3 (diff) | |
download | u-boot-cb73fe9eeae0d71a74eef811b0ba34aaf5513dbe.zip u-boot-cb73fe9eeae0d71a74eef811b0ba34aaf5513dbe.tar.gz u-boot-cb73fe9eeae0d71a74eef811b0ba34aaf5513dbe.tar.bz2 |
include: Move snprintf to stdio.h
Move snprintf to stdio.h since it is needed by exteranl libraries.
Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
-rw-r--r-- | arch/arc/lib/cpu.c | 2 | ||||
-rw-r--r-- | board/Synology/common/legacy.c | 1 | ||||
-rw-r--r-- | board/ti/common/fdt_ops.c | 2 | ||||
-rw-r--r-- | cmd/part.c | 1 | ||||
-rw-r--r-- | common/button_cmd.c | 2 | ||||
-rw-r--r-- | drivers/cpu/mpc83xx_cpu.c | 2 | ||||
-rw-r--r-- | include/stdio.h | 17 | ||||
-rw-r--r-- | include/vsprintf.h | 17 | ||||
-rw-r--r-- | lib/display_options.c | 1 | ||||
-rw-r--r-- | lib/fwu_updates/fwu_mtd.c | 2 | ||||
-rw-r--r-- | lib/hexdump.c | 2 | ||||
-rw-r--r-- | lib/vsprintf.c | 1 | ||||
-rw-r--r-- | test/dm/scmi.c | 2 | ||||
-rw-r--r-- | test/print_ut.c | 1 |
14 files changed, 29 insertions, 24 deletions
diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 5939504..269b4db 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -7,7 +7,7 @@ #include <clock_legacy.h> #include <init.h> #include <malloc.h> -#include <vsprintf.h> +#include <stdio.h> #include <asm/arcregs.h> #include <asm/cache.h> #include <asm/global_data.h> diff --git a/board/Synology/common/legacy.c b/board/Synology/common/legacy.c index a0bace7..2e3aa66 100644 --- a/board/Synology/common/legacy.c +++ b/board/Synology/common/legacy.c @@ -6,6 +6,7 @@ */ #include <config.h> +#include <stdio.h> #include <vsprintf.h> #include <env.h> #include <net.h> diff --git a/board/ti/common/fdt_ops.c b/board/ti/common/fdt_ops.c index eb917be..8a33009 100644 --- a/board/ti/common/fdt_ops.c +++ b/board/ti/common/fdt_ops.c @@ -6,7 +6,7 @@ */ #include <env.h> -#include <vsprintf.h> +#include <stdio.h> #include "fdt_ops.h" void ti_set_fdt_env(const char *board_name, struct ti_fdt_map *fdt_map) @@ -19,6 +19,7 @@ #include <command.h> #include <env.h> #include <part.h> +#include <stdio.h> #include <vsprintf.h> enum cmd_part_info { diff --git a/common/button_cmd.c b/common/button_cmd.c index 8642c26..72dac1f 100644 --- a/common/button_cmd.c +++ b/common/button_cmd.c @@ -8,7 +8,7 @@ #include <command.h> #include <env.h> #include <log.h> -#include <vsprintf.h> +#include <stdio.h> /* 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 9a7b5fd..127d3c3 100644 --- a/drivers/cpu/mpc83xx_cpu.c +++ b/drivers/cpu/mpc83xx_cpu.c @@ -9,7 +9,7 @@ #include <cpu.h> #include <dm.h> #include <log.h> -#include <vsprintf.h> +#include <stdio.h> #include <linux/bitops.h> #include "mpc83xx_cpu.h" diff --git a/include/stdio.h b/include/stdio.h index 3241e2d..7b999a5 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -46,6 +46,23 @@ static inline int vprintf(const char *fmt, va_list args) } #endif +/** + * 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))); + /* * FILE based functions (can only be used AFTER relocation!) */ diff --git a/include/vsprintf.h b/include/vsprintf.h index ed8a060..fe95147 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -225,23 +225,6 @@ char *simple_xtoa(ulong num); * @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 - * - * @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 * * The return value is the number of characters written into @buf not including * the trailing '\0'. If @size is == 0 the function returns 0. diff --git a/lib/display_options.c b/lib/display_options.c index d6b9355..d5df53a 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -12,6 +12,7 @@ #include <linux/ctype.h> #include <linux/kernel.h> #include <asm/io.h> +#include <stdio.h> #include <vsprintf.h> 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 69cd3d7..4a52834 100644 --- a/lib/fwu_updates/fwu_mtd.c +++ b/lib/fwu_updates/fwu_mtd.c @@ -11,7 +11,7 @@ #include <malloc.h> #include <mtd.h> #include <uuid.h> -#include <vsprintf.h> +#include <stdio.h> #include <dm/ofnode.h> diff --git a/lib/hexdump.c b/lib/hexdump.c index 33e3e6e..2bc508f 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -10,7 +10,7 @@ #include <hexdump.h> #include <mapmem.h> -#include <vsprintf.h> +#include <stdio.h> #include <linux/ctype.h> #include <linux/compat.h> #include <linux/log2.h> diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 27ea9c9..cfd1f19 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -19,6 +19,7 @@ #include <hexdump.h> #include <stdarg.h> #include <uuid.h> +#include <stdio.h> #include <vsprintf.h> #include <linux/ctype.h> #include <linux/err.h> diff --git a/test/dm/scmi.c b/test/dm/scmi.c index 69fc900..c9a0352 100644 --- a/test/dm/scmi.c +++ b/test/dm/scmi.c @@ -18,7 +18,7 @@ #include <scmi_agent.h> #include <scmi_agent-uclass.h> #include <scmi_protocols.h> -#include <vsprintf.h> +#include <stdio.h> #include <asm/scmi_test.h> #include <dm/device-internal.h> #include <dm/test.h> diff --git a/test/print_ut.c b/test/print_ut.c index bded2b6..53d3354 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -9,6 +9,7 @@ #include <log.h> #include <mapmem.h> #include <version_string.h> +#include <stdio.h> #include <vsprintf.h> #include <test/suites.h> #include <test/test.h> |