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

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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:

Merge mainline changes.

File:

• uspace/lib/c/include/str.h (modified) (1 diff)

uspace/lib/c/include/str.h

@@ -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 *);