staging: lustre: Cleanup cfs_str2mask in libcfs_string.c

- Replace body-less for-loop with while loop
- Use '\0' for null character instead of 0

Signed-off-by: Matthew Tyler <matt.tyler@flashics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
index e67a18d08ba51c2f201d31b1e0b636f6e8441c3c..76d4392bd28249c1d2611c2989be7ffd3c87d342 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
@@ -47,7 +47,7 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
                 int *oldmask, int minmask, int allmask)
 {
        const char *debugstr;
-       char op = 0;
+       char op = '\0';
        int newmask = minmask, i, len, found = 0;
 
        /* <str> must be a list of tokens separated by whitespace
@@ -55,10 +55,10 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
         * appears first in <str>, '*oldmask' is used as the starting point
         * (relative), otherwise minmask is used (absolute).  An operator
         * applies to all following tokens up to the next operator. */
-       while (*str != 0) {
+       while (*str != '\0') {
                while (isspace(*str))
                        str++;
-               if (*str == 0)
+               if (*str == '\0')
                        break;
                if (*str == '+' || *str == '-') {
                        op = *str++;
@@ -67,13 +67,15 @@ int cfs_str2mask(const char *str, const char *(*bit2str)(int bit),
                                newmask = *oldmask;
                        while (isspace(*str))
                                str++;
-                       if (*str == 0)    /* trailing op */
+                       if (*str == '\0')  /* trailing op */
                                return -EINVAL;
                }
 
                /* find token length */
-               for (len = 0; str[len] != 0 && !isspace(str[len]) &&
-                     str[len] != '+' && str[len] != '-'; len++);
+               len = 0;
+               while (str[len] != '\0' && !isspace(str[len]) &&
+                      str[len] != '+' && str[len] != '-')
+                       len++;
 
                /* match token */
                found = 0;