From 5415686b41adb8c75a6c1da999aeddd6894b3010 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Wed, 14 May 2025 11:53:11 -0600 Subject: libmisc: _intercept.h: Have __lm_printf return size_t instead of int --- libmisc/intercept.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libmisc/intercept.c') diff --git a/libmisc/intercept.c b/libmisc/intercept.c index 85a3801..332bfa5 100644 --- a/libmisc/intercept.c +++ b/libmisc/intercept.c @@ -11,19 +11,19 @@ #include [[gnu::weak]] -int __lm_printf(const char *format, ...) { +size_t __lm_printf(const char *format, ...) { va_list va; va_start(va, format); - int ret = vprintf(format, va); + size_t ret = (size_t) vprintf(format, va); va_end(va); return ret; } [[gnu::weak]] -int __lm_light_printf(const char *format, ...) { +size_t __lm_light_printf(const char *format, ...) { va_list va; va_start(va, format); - int ret = vprintf(format, va); + size_t ret = (size_t) vprintf(format, va); va_end(va); return ret; } -- cgit v1.2.3-2-g168b From f01b89b599d40df5d6c127310b0030cd41c8dc85 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Tue, 13 May 2025 18:46:08 -0600 Subject: libmisc: log.h: Add support for libmisc/fmt.h printing --- libmisc/intercept.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libmisc/intercept.c') diff --git a/libmisc/intercept.c b/libmisc/intercept.c index 332bfa5..af10ea3 100644 --- a/libmisc/intercept.c +++ b/libmisc/intercept.c @@ -5,7 +5,7 @@ */ #include /* for va_list, va_start(), va_end() */ -#include /* for vprintf() */ +#include /* for vprintf(), putchar() */ #include /* for abort() */ #include @@ -28,6 +28,11 @@ size_t __lm_light_printf(const char *format, ...) { return ret; } +[[gnu::weak]] +void __lm_putchar(unsigned char c) { + (void) putchar(c); +} + [[gnu::weak]] void __lm_abort(void) { abort(); -- cgit v1.2.3-2-g168b From 67cec6d2770aa14a13c89247612f16c628ebd54c Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Wed, 14 May 2025 12:20:02 -0600 Subject: libmisc: Remove uses of printf --- libmisc/intercept.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'libmisc/intercept.c') diff --git a/libmisc/intercept.c b/libmisc/intercept.c index af10ea3..70671f6 100644 --- a/libmisc/intercept.c +++ b/libmisc/intercept.c @@ -19,15 +19,6 @@ size_t __lm_printf(const char *format, ...) { return ret; } -[[gnu::weak]] -size_t __lm_light_printf(const char *format, ...) { - va_list va; - va_start(va, format); - size_t ret = (size_t) vprintf(format, va); - va_end(va); - return ret; -} - [[gnu::weak]] void __lm_putchar(unsigned char c) { (void) putchar(c); -- cgit v1.2.3-2-g168b From 3faaad9fe1f11cfe5699c6720c897bfddc7cf49a Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Thu, 15 May 2025 00:18:27 -0600 Subject: Begone with the printf variants of the log functions --- libmisc/intercept.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'libmisc/intercept.c') diff --git a/libmisc/intercept.c b/libmisc/intercept.c index 70671f6..30870bf 100644 --- a/libmisc/intercept.c +++ b/libmisc/intercept.c @@ -4,21 +4,11 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -#include /* for va_list, va_start(), va_end() */ -#include /* for vprintf(), putchar() */ +#include /* for putchar() */ #include /* for abort() */ #include -[[gnu::weak]] -size_t __lm_printf(const char *format, ...) { - va_list va; - va_start(va, format); - size_t ret = (size_t) vprintf(format, va); - va_end(va); - return ret; -} - [[gnu::weak]] void __lm_putchar(unsigned char c) { (void) putchar(c); -- cgit v1.2.3-2-g168b