Changeset e3bc355 in mainline for uspace/lib/c/include/str.h

Timestamp:

2013-07-28T23:07:18Z (13 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

2b55edb

Parents:

283ea3d (diff), ccdc63e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline merge

File:

• uspace/lib/c/include/str.h (modified) (2 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 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 *);