Changeset 15d0046 in mainline for uspace/srv/logger/initlvl.c
- Timestamp:
- 2014-09-12T13:22:33Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9b20126
- Parents:
- 8db09e4 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/logger/initlvl.c
r8db09e4 r15d0046 44 44 { 45 45 char *tmp; 46 char *key = str tok_r(setting, "=", &tmp);47 char *value = str tok_r(NULL, "=", &tmp);46 char *key = str_tok(setting, "=", &tmp); 47 char *value = str_tok(tmp, "=", &tmp); 48 48 if (key == NULL) 49 49 return; … … 76 76 { 77 77 char *tmp; 78 char *single_setting = str tok_r(settings, " ", &tmp);78 char *single_setting = str_tok(settings, " ", &tmp); 79 79 while (single_setting != NULL) { 80 80 parse_single_level_setting(single_setting); 81 single_setting = str tok_r(NULL, " ", &tmp);81 single_setting = str_tok(tmp, " ", &tmp); 82 82 } 83 83 }
Note:
See TracChangeset
for help on using the changeset viewer.