Changeset 8e7c9fe in mainline for uspace/srv/logger/initlvl.c

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/srv/logger/initlvl.c (modified) (2 diffs)

uspace/srv/logger/initlvl.c

@@ -44 +44 @@
 {
         char *tmp;
-        char *key = strtok_r(setting, "=", &tmp);
-        char *value = strtok_r(NULL, "=", &tmp);
+        char *key = str_tok(setting, "=", &tmp);
+        char *value = str_tok(tmp, "=", &tmp);
         if (key == NULL)
                 return;
@@ -76 +76 @@
 {
         char *tmp;
-        char *single_setting = strtok_r(settings, " ", &tmp);
+        char *single_setting = str_tok(settings, " ", &tmp);
         while (single_setting != NULL) {
                 parse_single_level_setting(single_setting);
-                single_setting = strtok_r(NULL, " ", &tmp);
+                single_setting = str_tok(tmp, " ", &tmp);
         }
 }