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

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

uspace/lib/c/include/str.h

@@ -109 +109 @@
 extern char *str_ndup(const char *, size_t max_size);
 
+extern char *str_tok(char *, const char *, char **);
+
 extern int str_uint8_t(const char *, const char **, unsigned int, bool,
     uint8_t *);
@@ -132 +134 @@
 extern unsigned long strtoul(const char *, char **, int);
 
-extern char * strtok_r(char *, const char *, char **);
-extern char * strtok(char *, const char *);
-
 #endif