diff options
| -rw-r--r-- | jim-eventloop.c | 7 | ||||
| -rw-r--r-- | jim-format.c | 2 | ||||
| -rw-r--r-- | jim-pack.c | 2 | ||||
| -rw-r--r-- | jim.c | 15 |
4 files changed, 9 insertions, 17 deletions
diff --git a/jim-eventloop.c b/jim-eventloop.c index 5681b00..6744330 100644 --- a/jim-eventloop.c +++ b/jim-eventloop.c @@ -242,8 +242,7 @@ jim_wide Jim_CreateTimeHandler(Jim_Interp *interp, jim_wide milliseconds, static jim_wide JimParseAfterId(Jim_Obj *idObj) { - int len; - const char *tok = Jim_GetString(idObj, &len); + const char *tok = Jim_String(idObj); jim_wide id; if (strncmp(tok, "after#", 6) == 0 && Jim_StringToWide(tok + 6, &id, 10) == JIM_OK) { @@ -557,9 +556,7 @@ static int JimELVwaitCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } else { /* If a result was left, it is an error */ - int len; - Jim_GetString(interp->result, &len); - if (len) { + if (Jim_Length(Jim_GetResult(interp))) { return JIM_ERR; } } diff --git a/jim-format.c b/jim-format.c index bf149a2..ed612cc 100644 --- a/jim-format.c +++ b/jim-format.c @@ -75,7 +75,7 @@ Jim_Obj *Jim_FormatString(Jim_Interp *interp, Jim_Obj *fmtObjPtr, int objc, Jim_ span = format = Jim_GetString(fmtObjPtr, &formatLen); formatEnd = format + formatLen; - resultPtr = Jim_NewStringObj(interp, "", 0); + resultPtr = Jim_NewEmptyStringObj(interp); while (format != formatEnd) { char *end; @@ -355,7 +355,7 @@ static int Jim_PackCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) if (width > Jim_Length(argv[2])) { width = Jim_Length(argv[2]); } - memcpy(stringObjPtr->bytes + pos, Jim_GetString(argv[2], NULL), width); + memcpy(stringObjPtr->bytes + pos, Jim_String(argv[2]), width); /* No padding is needed since the string is already extended */ } @@ -5621,13 +5621,7 @@ static void JimSetStackTrace(Jim_Interp *interp, Jim_Obj *stackTraceObj) */ len = Jim_ListLength(interp, interp->stackTrace); if (len >= 3) { - Jim_Obj *filenameObj; - - Jim_ListIndex(interp, interp->stackTrace, len - 2, &filenameObj, JIM_NONE); - - Jim_GetString(filenameObj, &len); - - if (!Jim_Length(filenameObj)) { + if (Jim_Length(Jim_ListGetIndex(interp, interp->stackTrace, len - 2)) == 0) { interp->addStackTrace = 1; } } @@ -5657,10 +5651,11 @@ static void JimAppendStackTrace(Jim_Interp *interp, const char *procname, int len = Jim_ListLength(interp, interp->stackTrace); if (len >= 3) { - Jim_Obj *objPtr; - if (Jim_ListIndex(interp, interp->stackTrace, len - 3, &objPtr, JIM_NONE) == JIM_OK && Jim_Length(objPtr)) { + Jim_Obj *objPtr = Jim_ListGetIndex(interp, interp->stackTrace, len - 3); + if (Jim_Length(objPtr)) { /* Yes, the previous level had procname */ - if (Jim_ListIndex(interp, interp->stackTrace, len - 2, &objPtr, JIM_NONE) == JIM_OK && !Jim_Length(objPtr)) { + objPtr = Jim_ListGetIndex(interp, interp->stackTrace, len - 2); + if (Jim_Length(objPtr) == 0) { /* But no filename, so merge the new info with that frame */ ListSetIndex(interp, interp->stackTrace, len - 2, fileNameObj, 0); ListSetIndex(interp, interp->stackTrace, len - 1, Jim_NewIntObj(interp, linenr), 0); |