Changeset d066259 in mainline for kernel/generic/include/str.h

Timestamp:

2019-02-05T17:42:58Z (6 years ago)

Author:

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

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

08e103d4, bb97118, d80fa05

Parents:

cca2d93b

Message:

Synchronize str.c/str.h across boot/kernel/uspace

File:

• kernel/generic/include/str.h (modified) (5 diffs)

kernel/generic/include/str.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -36 +38 @@
 #define KERN_STR_H_
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <errno.h>
 
-/**< Common Unicode characters */
+/* Common Unicode characters */
 #define U_SPECIAL      '?'
 
@@ -61 +63 @@
 #define U_CURSOR       0x2588
 
-/**< No size limit constant */
+/** No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)
 
-/**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  ((cnt) << 2)
+/** Maximum size of a string containing @c length characters */
+#define STR_BOUNDS(length)  ((length) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
@@ -92 +94 @@
 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
 
-extern char *str_dup(const char *src);
-extern char *str_ndup(const char *src, size_t n);
-
 extern char *str_chr(const char *str, wchar_t ch);
 
@@ -100 +99 @@
 extern bool wstr_remove(wchar_t *str, size_t pos);
 
-extern errno_t str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
+extern char *str_dup(const char *src);
+extern char *str_ndup(const char *src, size_t n);
+
+extern errno_t str_uint64_t(const char *, char **, unsigned int, bool,
+    uint64_t *);
 
 extern void order_suffix(const uint64_t, uint64_t *, char *);