diff options
| -rw-r--r-- | jim.c | 12 | ||||
| -rw-r--r-- | jimregexp.c | 2 |
2 files changed, 6 insertions, 8 deletions
@@ -13564,13 +13564,13 @@ static Jim_Obj *JimStringMap(Jim_Interp *interp, Jim_Obj *mapListObjPtr, resultObjPtr = Jim_NewStringObj(interp, "", 0); while (strLen) { for (i = 0; i < numMaps; i += 2) { - Jim_Obj *objPtr; + Jim_Obj *eachObjPtr; const char *k; int kl; - objPtr = Jim_ListGetIndex(interp, mapListObjPtr, i); - k = Jim_String(objPtr); - kl = Jim_Utf8Length(interp, objPtr); + eachObjPtr = Jim_ListGetIndex(interp, mapListObjPtr, i); + k = Jim_String(eachObjPtr); + kl = Jim_Utf8Length(interp, eachObjPtr); if (strLen >= kl && kl) { int rc; @@ -13818,7 +13818,6 @@ badcompareargs: case OPT_REVERSE:{ char *buf, *p; const char *str; - int len; int i; if (argc != 3) { @@ -14750,9 +14749,8 @@ static int Jim_InfoCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg break; case INFO_STATICS: if (cmdPtr->u.proc.staticVars) { - int mode = JIM_VARLIST_LOCALS | JIM_VARLIST_VALUES; Jim_SetResult(interp, JimHashtablePatternMatch(interp, cmdPtr->u.proc.staticVars, - NULL, JimVariablesMatch, mode)); + NULL, JimVariablesMatch, JIM_VARLIST_LOCALS | JIM_VARLIST_VALUES)); } break; } diff --git a/jimregexp.c b/jimregexp.c index dca55a2..b256e76 100644 --- a/jimregexp.c +++ b/jimregexp.c @@ -756,7 +756,7 @@ static int regatom(regex_t *preg, int *flagp) int i; for (i = 0; i < CC_NUM; i++) { - int n = strlen(character_class[i]); + n = strlen(character_class[i]); if (strncmp(pattern, character_class[i], n) == 0) { /* Found a character class */ pattern += n + 1; |