Changeset fdfb24e in mainline for boot

Timestamp:

2023-10-27T17:53:21Z (20 months ago)

Author:

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

Branches:

master, topic/msim-upgrade, topic/simplify-dev-export

Children:

55c5cb05

Parents:

44e8541

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 17:38:24)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-27 17:53:21)

Message:

Deduplicate string related functions

Location:

boot

Files:

• arch/arm32/meson.build (modified) (1 diff)
• arch/arm64/meson.build (modified) (1 diff)
• 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/assert.h (moved) (moved from boot/generic/include/str.h ) (2 diffs)
• generic/include/errno.h (modified) (1 diff)
• generic/src/str.c (deleted)

boot/arch/arm32/meson.build

@@ -70 +70 @@
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/version.c',
         '../../generic/src/inflate.c',

boot/arch/arm64/meson.build

@@ -56 +56 @@
         '../../generic/src/printf.c',
         '../../generic/src/printf_core.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/tar.c',
         '../../generic/src/version.c',

boot/arch/ia64/meson.build

@@ -48 +48 @@
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/version.c',
         '../../generic/src/inflate.c',

boot/arch/mips32/meson.build

@@ -48 +48 @@
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/version.c',
         '../../generic/src/inflate.c',

boot/arch/ppc32/meson.build

@@ -46 +46 @@
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/version.c',
         '../../generic/src/inflate.c',

boot/arch/riscv64/meson.build

@@ -42 +42 @@
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/version.c',
         '../../generic/src/inflate.c',

boot/arch/sparc64/meson.build

@@ -44 +44 @@
         '../../generic/src/vprintf.c',
         '../../generic/src/printf.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/version.c',
         '../../generic/src/inflate.c',

boot/generic/include/assert.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
- * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2011 Oleg Romanenko
+ * Copyright (c) 2023 Jiří Zárevúcky
  * All rights reserved.
  *
@@ -29 +27 @@
  */
 
-/** @file
- */
+#ifndef BOOT_ASSERT_H_
+#define BOOT_ASSERT_H_
 
-#ifndef BOOT_STR_H_
-#define BOOT_STR_H_
+#define assert(expr) ((void) (expr))
 
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <uchar.h>
-
-/* Common Unicode characters */
-#define U_SPECIAL  '?'
-
-/** No size limit constant */
-#define STR_NO_LIMIT  ((size_t) -1)
-
-extern char32_t str_decode(const char *str, size_t *offset, size_t sz);
-extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz);
-
-extern size_t str_size(const char *str);
-extern size_t str_lsize(const char *str, size_t max_len);
-extern size_t str_length(const char *str);
-
-extern bool ascii_check(char32_t ch);
-extern bool chr_check(char32_t ch);
-
-extern int str_cmp(const char *s1, const char *s2);
-extern void str_cpy(char *dest, size_t size, const char *src);
-
-#endif
-
-/** @}
- */
+#endif /* BOOT_ASSERT_H_ */

boot/generic/include/errno.h

@@ -39 +39 @@
 #define EINVAL     -14  /* Invalid value. */
 #define EOVERFLOW  -16  /* The result does not fit its size. */
+#define EIO        -17
 
 typedef int errno_t;