00da72bee
Denys Vlasenko
2015-10-23
Subject
tidy up strtok use
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/kernel_version.c+4 -4
| @@ -20,16 +20,16 @@ | |
| int FAST_FUNC get_linux_version_code(void) | |
| { | |
| struct utsname name; | |
| - | char *s, *t; |
| + | char *t; |
| int i, r; | |
| uname(&name); /* never fails */ | |
| - | s = name.release; |
| + | t = name.release; |
| r = 0; | |
| for (i = 0; i < 3; i++) { | |
| - | t = strtok(s, "."); |
| + | t = strtok(t, "."); |
| r = r * 256 + (t ? atoi(t) : 0); | |
| - | s = NULL; |
| + | t = NULL; |
| } | |
| return r; | |
| } | |
shell/ash.c+1 -1
| @@ -2556,7 +2556,7 @@ updatepwd(const char *dir) | |
| new = stack_putstr(p, new); | |
| USTPUTC('/', new); | |
| } | |
| - | p = strtok(0, "/"); |
| + | p = strtok(NULL, "/"); |
| } | |
| if (new > lim) | |
| STUNPUTC(new); | |