Changeset f5e1692 in mainline

Timestamp:

2025-04-13T19:56:36Z (43 hours ago)

Author:

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

Branches:

master

Children:

6d0e133, c7c6afd

Parents:

163e34c

git-author:

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

git-committer:

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

Message:

Get rid of /boot version of printf_core()

Location:

boot

Files:

• arch/arm32/meson.build (modified) (1 diff)
• arch/arm64/meson.build (modified) (2 diffs)
• arch/ia64/meson.build (modified) (1 diff)
• arch/mips32/meson.build (modified) (1 diff)
• arch/ppc32/meson.build (modified) (1 diff)
• arch/riscv64/meson.build (modified) (1 diff)
• arch/sparc64/meson.build (modified) (1 diff)
• generic/include/macros.h (modified) (1 diff)
• generic/include/printf_core.h (deleted)
• generic/include/uchar.h (deleted)
• generic/src/printf_core.c (deleted)
• generic/src/vprintf.c (modified) (2 diffs)

boot/arch/arm32/meson.build

@@ -66 +66 @@
         'src/putchar.c',
         '../../../common/stdc/mem.c',
+        '../../../common/printf/printf_core.c',
         '../../genarch/src/division.c',
-        '../../generic/src/printf_core.c',
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',

boot/arch/arm64/meson.build

@@ -49 +49 @@
         'src/relocate.c',
         '../../../common/stdc/mem.c',
+        '../../../common/printf/printf_core.c',
         '../../genarch/src/efi.c',
         '../../generic/src/gzip.c',
@@ -55 +56 @@
         '../../generic/src/payload.c',
         '../../generic/src/printf.c',
-        '../../generic/src/printf_core.c',
         '../../../common/str.c',
         '../../generic/src/tar.c',

boot/arch/ia64/meson.build

@@ -45 +45 @@
         '../../genarch/src/division.c',
         '../../generic/src/balloc.c',
-        '../../generic/src/printf_core.c',
+        '../../../common/printf/printf_core.c',
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',

boot/arch/mips32/meson.build

@@ -45 +45 @@
         '../../genarch/src/division.c',
         '../../genarch/src/multiplication.c',
-        '../../generic/src/printf_core.c',
+        '../../../common/printf/printf_core.c',
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',

boot/arch/ppc32/meson.build

@@ -43 +43 @@
         '../../genarch/src/multiplication.c',
         '../../generic/src/balloc.c',
-        '../../generic/src/printf_core.c',
+        '../../../common/printf/printf_core.c',
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',

boot/arch/riscv64/meson.build

@@ -39 +39 @@
 
         '../../../common/stdc/mem.c',
-        '../../generic/src/printf_core.c',
+        '../../../common/printf/printf_core.c',
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',

boot/arch/sparc64/meson.build

@@ -41 +41 @@
         '../../genarch/src/ofw_tree.c',
         '../../generic/src/balloc.c',
-        '../../generic/src/printf_core.c',
+        '../../../common/printf/printf_core.c',
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',

boot/generic/include/macros.h

@@ -34 +34 @@
 
 #define min(a, b)  ((a) < (b) ? (a) : (b))
+#define max(a, b)  ((a) > (b) ? (a) : (b))
 
 #define isdigit(d)  (((d) >= '0') && ((d) <= '9'))

boot/generic/src/vprintf.c

@@ -36 +36 @@
 #include <str.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;
+        return EOK;
 }
 
@@ -71 +68 @@
         };
 
-        int ret = printf_core(fmt, &ps, ap);
-
-        return ret;
+        return printf_core(fmt, &ps, ap);
 }