make convert_delimiter use strchr instead of open-coding it
authorSteve French <smfrench@gmail.com>
Fri, 30 Nov 2012 00:07:51 +0000 (18:07 -0600)
committerSteve French <smfrench@gmail.com>
Wed, 5 Dec 2012 19:27:30 +0000 (13:27 -0600)
Take advantage of accelerated strchr() on arches that support it.

Also, no caller ever passes in a NULL pointer. Get rid of the unneeded
NULL pointer check.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/cifsglob.h

index 052d85b..74a07b6 100644 (file)
@@ -1064,21 +1064,16 @@ static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
 static inline void
 convert_delimiter(char *path, char delim)
 {
-       int i;
-       char old_delim;
-
-       if (path == NULL)
-               return;
+       char old_delim, *pos;
 
        if (delim == '/')
                old_delim = '\\';
        else
                old_delim = '/';
 
-       for (i = 0; path[i] != '\0'; i++) {
-               if (path[i] == old_delim)
-                       path[i] = delim;
-       }
+       pos = path;
+       while ((pos = strchr(pos, old_delim)))
+               *pos = delim;
 }
 
 #ifdef CONFIG_CIFS_STATS