Changes in uspace/lib/c/include/str.h [568693b:ee3f6f6] in mainline

File:

• uspace/lib/c/include/str.h (modified) (3 diffs)

uspace/lib/c/include/str.h

@@ -39 +39 @@
 #include <mem.h>
 #include <sys/types.h>
-#include <bool.h>
+#include <stdbool.h>
 
 #define U_SPECIAL  '?'
@@ -109 +109 @@
 extern char *str_ndup(const char *, size_t max_size);
 
-extern int str_uint8_t(const char *, char **, unsigned int, bool, uint8_t *);
-extern int str_uint16_t(const char *, char **, unsigned int, bool, uint16_t *);
-extern int str_uint32_t(const char *, char **, unsigned int, bool, uint32_t *);
-extern int str_uint64_t(const char *, char **, unsigned int, bool, uint64_t *);
-extern int str_size_t(const char *, char **, unsigned int, bool, size_t *);
+extern char *str_tok(char *, const char *, char **);
+
+extern int str_uint8_t(const char *, const char **, unsigned int, bool,
+    uint8_t *);
+extern int str_uint16_t(const char *, const char **, unsigned int, bool,
+    uint16_t *);
+extern int str_uint32_t(const char *, const char **, unsigned int, bool,
+    uint32_t *);
+extern int str_uint64_t(const char *, const char **, unsigned int, bool,
+    uint64_t *);
+extern int str_size_t(const char *, const char **, unsigned int, bool,
+    size_t *);
 
 extern void order_suffix(const uint64_t, uint64_t *, char *);
@@ -127 +134 @@
 extern unsigned long strtoul(const char *, char **, int);
 
-extern char * strtok_r(char *, const char *, char **);
-extern char * strtok(char *, const char *);
-
 #endif