diff options
| author | Steve Bennett <steveb@workware.net.au> | 2010-10-12 18:56:50 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2010-10-15 11:02:58 +1000 |
| commit | 60d9282e2a555fab704e63850c2a396ff2d6d4f8 (patch) | |
| tree | ac6ae71bfda573e0daf18b4baaddd77b73d32950 /jim-regexp.c | |
| parent | 3eebcc11140b5b876c2cb0ef3ee95f7b9c2f9195 (diff) | |
| download | jimtcl-60d9282e2a555fab704e63850c2a396ff2d6d4f8.zip jimtcl-60d9282e2a555fab704e63850c2a396ff2d6d4f8.tar.gz jimtcl-60d9282e2a555fab704e63850c2a396ff2d6d4f8.tar.bz2 | |
Fix -Wshadow warnings
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim-regexp.c')
| -rw-r--r-- | jim-regexp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jim-regexp.c b/jim-regexp.c index 77be9f7..c4257f5 100644 --- a/jim-regexp.c +++ b/jim-regexp.c @@ -443,16 +443,16 @@ int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) */ for (src = replace_str; *src; src++) { - int index; + int idx; int c = *src; if (c == '&') { - index = 0; + idx = 0; } else if (c == '\\') { c = *++src; if ((c >= '0') && (c <= '9')) { - index = c - '0'; + idx = c - '0'; } else if ((c == '\\') || (c == '&')) { Jim_AppendString(interp, resultObj, src, 1); @@ -467,9 +467,9 @@ int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) Jim_AppendString(interp, resultObj, src, 1); continue; } - if ((index < MAX_SUB_MATCHES) && pmatch[index].rm_so != -1 && pmatch[index].rm_eo != -1) { - Jim_AppendString(interp, resultObj, p + pmatch[index].rm_so, - pmatch[index].rm_eo - pmatch[index].rm_so); + if ((idx < MAX_SUB_MATCHES) && pmatch[idx].rm_so != -1 && pmatch[idx].rm_eo != -1) { + Jim_AppendString(interp, resultObj, p + pmatch[idx].rm_so, + pmatch[idx].rm_eo - pmatch[idx].rm_so); } } |