From 1616b8642c6524e27cf81fe2a9c1e0e9b0bc912f Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Sat, 3 Mar 2012 01:15:56 +0200 Subject: [PATCH] Use strchr instead of index Signed-off-by: Ran Benita --- src/maprules.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/maprules.c b/src/maprules.c index b868b8b..37ada76 100644 --- a/src/maprules.c +++ b/src/maprules.c @@ -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; -- 2.7.4