Use strchr instead of index
authorRan Benita <ran234@gmail.com>
Fri, 2 Mar 2012 23:15:56 +0000 (01:15 +0200)
committerRan Benita <ran234@gmail.com>
Fri, 2 Mar 2012 23:17:57 +0000 (01:17 +0200)
Signed-off-by: Ran Benita <ran234@gmail.com>
src/maprules.c

index b868b8b..37ada76 100644 (file)
@@ -761,7 +761,7 @@ XkbRF_SubstituteVars(char *name, XkbRF_MultiDefsPtr mdefs)
     int len, ndx;
 
     orig= name;
-    str= index(name,'%');
+    str= strchr(name,'%');
     if (str==NULL)
        return name;
     len= strlen(name);
@@ -779,7 +779,7 @@ XkbRF_SubstituteVars(char *name, XkbRF_MultiDefsPtr mdefs)
        var = str + 1;
        str = get_index(var + 1, &ndx);
        if (ndx == -1) {
-           str = index(str,'%');
+           str = strchr(str,'%');
            continue;
         }
        if ((*var=='l') && mdefs->layout[ndx] && *mdefs->layout[ndx])
@@ -791,7 +791,7 @@ XkbRF_SubstituteVars(char *name, XkbRF_MultiDefsPtr mdefs)
        if ((pfx=='(')&&(*str==')')) {
            str++;
        }
-       str= index(&str[0],'%');
+       str= strchr(&str[0],'%');
     }
     name= (char *)malloc(len+1);
     str= orig;