Deduplicate string related functions

mvolfik · Oct 27, 2023 · fdfb24e · fdfb24e
1 parent 44e8541
commit fdfb24e
Show file tree

Hide file tree

Showing 28 changed files with 76 additions and 1,857 deletions.
diff --git a/boot/arch/arm32/meson.build b/boot/arch/arm32/meson.build
@@ -69,7 +69,7 @@ boot_src = files(
 	'../../generic/src/printf_core.c',
 	'../../generic/src/vprintf.c',
 	'../../generic/src/printf.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/version.c',
 	'../../generic/src/inflate.c',
 	'../../generic/src/gzip.c',

diff --git a/boot/arch/arm64/meson.build b/boot/arch/arm64/meson.build
@@ -55,7 +55,7 @@ boot_src = files(
 	'../../generic/src/payload.c',
 	'../../generic/src/printf.c',
 	'../../generic/src/printf_core.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/tar.c',
 	'../../generic/src/version.c',
 	'../../generic/src/vprintf.c',

diff --git a/boot/arch/ia64/meson.build b/boot/arch/ia64/meson.build
@@ -47,7 +47,7 @@ boot_src = files(
 	'../../generic/src/printf_core.c',
 	'../../generic/src/vprintf.c',
 	'../../generic/src/printf.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/version.c',
 	'../../generic/src/inflate.c',
 	'../../generic/src/tar.c',

diff --git a/boot/arch/mips32/meson.build b/boot/arch/mips32/meson.build
@@ -47,7 +47,7 @@ boot_src = files(
 	'../../generic/src/printf_core.c',
 	'../../generic/src/vprintf.c',
 	'../../generic/src/printf.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/version.c',
 	'../../generic/src/inflate.c',
 	'../../generic/src/gzip.c',

diff --git a/boot/arch/ppc32/meson.build b/boot/arch/ppc32/meson.build
@@ -45,7 +45,7 @@ boot_src = files(
 	'../../generic/src/printf_core.c',
 	'../../generic/src/vprintf.c',
 	'../../generic/src/printf.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/version.c',
 	'../../generic/src/inflate.c',
 	'../../generic/src/gzip.c',

diff --git a/boot/arch/riscv64/meson.build b/boot/arch/riscv64/meson.build
@@ -41,7 +41,7 @@ boot_src = files(
 	'../../generic/src/printf_core.c',
 	'../../generic/src/vprintf.c',
 	'../../generic/src/printf.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/version.c',
 	'../../generic/src/inflate.c',
 	'../../generic/src/gzip.c',

diff --git a/boot/arch/sparc64/meson.build b/boot/arch/sparc64/meson.build
@@ -43,7 +43,7 @@ boot_src = files(
 	'../../generic/src/printf_core.c',
 	'../../generic/src/vprintf.c',
 	'../../generic/src/printf.c',
-	'../../generic/src/str.c',
+	'../../../common/str.c',
 	'../../generic/src/version.c',
 	'../../generic/src/inflate.c',
 	'../../generic/src/gzip.c',

diff --git a/boot/generic/include/str.h → boot/generic/include/assert.h b/boot/generic/include/str.h → boot/generic/include/assert.h
@@ -1,7 +1,5 @@
 /*
- * 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.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,37 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/** @file
- */
-
-#ifndef BOOT_STR_H_
-#define BOOT_STR_H_
-
-#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)
+#ifndef BOOT_ASSERT_H_
+#define BOOT_ASSERT_H_
 
-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);
+#define assert(expr) ((void) (expr))
 
-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_ */
diff --git a/boot/generic/include/errno.h b/boot/generic/include/errno.h
@@ -38,6 +38,7 @@
 #define ELIMIT     -3   /* Limit exceeded. */
 #define EINVAL     -14  /* Invalid value. */
 #define EOVERFLOW  -16  /* The result does not fit its size. */
+#define EIO        -17
 
 typedef int errno_t;