tidy up strtok use

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 738ed022b3bb16313ee6e65b576caef789ae8358..9b6c6229919fd66ba67c2a0add01f752d03edfe5 100644 (file)
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -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;
 }

diff --git a/shell/ash.c b/shell/ash.c
index 8a1628e81f3c8826e3a1cb97b35e28f40aac8c41..17121aa9b7b897e80030f6a5488ff53f70fabc86 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -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);