Changeset 163e34c in mainline for kernel

Timestamp:

2025-04-13T19:33:48Z (3 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master

Children:

f5e1692

Parents:

97f6b71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-13 18:56:51)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2025-04-13 19:33:48)

Message:

Actually convert the printf outputs everywhere

Location:

kernel/generic

Files:

• meson.build (modified) (2 diffs)
• src/log/log.c (modified) (3 diffs)
• src/printf/snprintf.c (deleted)
• src/printf/vprintf.c (modified) (3 diffs)
• src/printf/vsnprintf.c (deleted)

kernel/generic/meson.build

@@ -40 +40 @@
         'common/adt/list.c',
         'common/adt/odict.c',
+        'common/gsort.c',
         'common/printf/printf_core.c',
         'common/stdc/calloc.c',
         'common/stdc/ctype.c',
         'common/stdc/mem.c',
-        'common/gsort.c',
+        'common/stdc/snprintf.c',
+        'common/stdc/vsnprintf.c',
         'common/str.c',
         'common/str_error.c',
@@ -96 +98 @@
         'src/mm/reserve.c',
         'src/printf/printf.c',
-        'src/printf/snprintf.c',
         'src/printf/vprintf.c',
-        'src/printf/vsnprintf.c',
         'src/proc/program.c',
         'src/proc/scheduler.c',

kernel/generic/src/log/log.c

@@ -33 +33 @@
  */
 
-#include <sysinfo/sysinfo.h>
-#include <synch/spinlock.h>
-#include <typedefs.h>
+#include <abi/log.h>
+#include <arch.h>
+#include <atomic.h>
+#include <console/console.h>
+#include <ddi/ddi.h>
 #include <ddi/irq.h>
-#include <ddi/ddi.h>
+#include <errno.h>
 #include <ipc/event.h>
 #include <ipc/irq.h>
-#include <arch.h>
+#include <log.h>
 #include <panic.h>
+#include <print.h>
+#include <printf_core.h>
 #include <putchar.h>
-#include <atomic.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <str.h>
+#include <synch/spinlock.h>
 #include <syscall/copy.h>
-#include <errno.h>
-#include <str.h>
-#include <print.h>
-#include <printf/printf_core.h>
-#include <stdarg.h>
-#include <log.h>
-#include <console/console.h>
-#include <abi/log.h>
-#include <stdlib.h>
+#include <sysinfo/sysinfo.h>
+#include <typedefs.h>
 
 #define LOG_PAGES    8
@@ -204 +204 @@
 {
         size_t offset = 0;
-        size_t chars = 0;
-
-        while (offset < size) {
+
+        while (offset < size)
                 kio_push_char(str_decode(str, &offset, size));
-                chars++;
-        }
 
         log_append((const uint8_t *)str, size);
 
-        return chars;
-}
-
-static int log_printf_wstr_write(const char32_t *wstr, size_t size, void *data)
-{
-        char buffer[16];
-        size_t offset = 0;
-        size_t chars = 0;
-
-        for (offset = 0; offset < size; offset += sizeof(char32_t), chars++) {
-                kio_push_char(wstr[chars]);
-
-                size_t buffer_offset = 0;
-                errno_t rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16);
-                if (rc != EOK) {
-                        return EOF;
-                }
-
-                log_append((const uint8_t *)buffer, buffer_offset);
-        }
-
-        return chars;
+        return EOK;
 }
 
@@ -243 +219 @@
 int log_vprintf(const char *fmt, va_list args)
 {
-        int ret;
-
         printf_spec_t ps = {
                 log_printf_str_write,
-                log_printf_wstr_write,
                 NULL
         };
 
-        ret = printf_core(fmt, &ps, args);
-
-        return ret;
+        return printf_core(fmt, &ps, args);
 }
 

kernel/generic/src/printf/vprintf.c

@@ -36 +36 @@
 #include <console/console.h>
 #include <print.h>
-#include <printf/printf_core.h>
+#include <printf_core.h>
 #include <putchar.h>
 #include <str.h>
@@ -42 +42 @@
 #include <typedefs.h>
 
-static int vprintf_str_write(const char *str, size_t size, void *data)
+static errno_t vprintf_str_write(const char *str, size_t size, void *data)
 {
         size_t offset = 0;
-        size_t chars = 0;
 
-        while (offset < size) {
+        while (offset < size)
                 putuchar(str_decode(str, &offset, size));
-                chars++;
-        }
 
-        return chars;
-}
-
-static int vprintf_wstr_write(const char32_t *str, size_t size, void *data)
-{
-        size_t offset = 0;
-        size_t chars = 0;
-
-        while (offset < size) {
-                putuchar(str[chars]);
-                chars++;
-                offset += sizeof(char32_t);
-        }
-
-        return chars;
+        return EOK;
 }
 
@@ -92 +75 @@
         printf_spec_t ps = {
                 vprintf_str_write,
-                vprintf_wstr_write,
                 NULL
         };