diff options
-rw-r--r-- | jim-aio.c | 12 | ||||
-rw-r--r-- | jim-clock.c | 4 | ||||
-rw-r--r-- | jim-eventloop.c | 2 | ||||
-rw-r--r-- | jim-exec.c | 8 | ||||
-rw-r--r-- | jim-file.c | 30 | ||||
-rw-r--r-- | jim-interactive.c | 2 | ||||
-rw-r--r-- | jim-load.c | 2 | ||||
-rw-r--r-- | jim-nvp.c | 10 | ||||
-rw-r--r-- | jim-package.c | 8 | ||||
-rw-r--r-- | jim-readdir.c | 2 | ||||
-rw-r--r-- | jim-readline.c | 4 | ||||
-rw-r--r-- | jim-regexp.c | 10 | ||||
-rw-r--r-- | jim-sdl.c | 2 | ||||
-rw-r--r-- | jim-signal.c | 8 | ||||
-rw-r--r-- | jim-sqlite.c | 8 | ||||
-rw-r--r-- | jim-sqlite3.c | 6 | ||||
-rw-r--r-- | jim-subcmd.c | 12 | ||||
-rw-r--r-- | jim-syslog.c | 10 | ||||
-rw-r--r-- | jim-win32.c | 16 | ||||
-rw-r--r-- | jim.c | 82 | ||||
-rw-r--r-- | jim.h | 1 | ||||
-rw-r--r-- | jimsh.c | 8 |
22 files changed, 124 insertions, 123 deletions
@@ -558,7 +558,7 @@ static int aio_cmd_sendto(Jim_Interp *interp, int argc, Jim_Obj *const *argv) int len; const char *wdata; union sockaddr_any sa; - const char *addr = Jim_GetString(argv[1], NULL); + const char *addr = Jim_String(argv[1]); int salen; if (IPV6 && af->addr_family == PF_INET6) { @@ -639,7 +639,7 @@ static int aio_cmd_eof(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int aio_cmd_close(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - Jim_DeleteCommand(interp, Jim_GetString(argv[0], NULL)); + Jim_DeleteCommand(interp, Jim_String(argv[0])); return JIM_OK; } @@ -916,7 +916,7 @@ static int JimAioOpenCommand(Jim_Interp *interp, int argc, Jim_WrongNumArgs(interp, 1, argv, "filename ?mode?"); return JIM_ERR; } - cmdname = Jim_GetString(argv[1], NULL); + cmdname = Jim_String(argv[1]); if (Jim_CompareStringImmediate(interp, argv[1], "stdin")) { OpenFlags |= AIO_KEEPOPEN; fp = stdin; @@ -930,8 +930,8 @@ static int JimAioOpenCommand(Jim_Interp *interp, int argc, fp = stderr; } else { - const char *mode = (argc == 3) ? Jim_GetString(argv[2], NULL) : "r"; - const char *filename = Jim_GetString(argv[1], NULL); + const char *mode = (argc == 3) ? Jim_String(argv[2]) : "r"; + const char *filename = Jim_String(argv[1]); #ifdef jim_ext_tclcompat /* If the filename starts with '|', use popen instead */ @@ -1084,7 +1084,7 @@ static int JimAioSockCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv) hdlfmt = "aio.sock%ld"; if (argc > 2) { - hostportarg = Jim_GetString(argv[2], NULL); + hostportarg = Jim_String(argv[2]); } switch (socktype) { diff --git a/jim-clock.c b/jim-clock.c index f51b14b..f771f71 100644 --- a/jim-clock.c +++ b/jim-clock.c @@ -35,7 +35,7 @@ static int clock_cmd_format(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } if (argc == 3) { - format = Jim_GetString(argv[2], NULL); + format = Jim_String(argv[2]); } if (Jim_GetLong(interp, argv[0], &seconds) != JIM_OK) { @@ -64,7 +64,7 @@ static int clock_cmd_scan(Jim_Interp *interp, int argc, Jim_Obj *const *argv) /* Initialise with the current date/time */ localtime_r(&now, &tm); - pt = strptime(Jim_GetString(argv[0], NULL), Jim_GetString(argv[2], NULL), &tm); + pt = strptime(Jim_String(argv[0]), Jim_String(argv[2]), &tm); if (pt == 0 || *pt != 0) { Jim_SetResultString(interp, "Failed to parse time according to format", -1); return JIM_ERR; diff --git a/jim-eventloop.c b/jim-eventloop.c index d3c5ce0..ce932a4 100644 --- a/jim-eventloop.c +++ b/jim-eventloop.c @@ -129,7 +129,7 @@ int Jim_EvalObjBackground(Jim_Interp *interp, Jim_Obj *scriptObjPtr) else { /* Report the error to stderr. */ Jim_MakeErrorMessage(interp); - fprintf(stderr, "%s\n", Jim_GetString(Jim_GetResult(interp), NULL)); + fprintf(stderr, "%s\n", Jim_String(Jim_GetResult(interp))); /* And reset the result */ Jim_SetResultString(interp, "", -1); } @@ -533,7 +533,7 @@ Jim_CreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, int **pid cmdCount = 1; lastBar = -1; for (i = 0; i < argc; i++) { - const char *arg = Jim_GetString(argv[i], NULL); + const char *arg = Jim_String(argv[i]); if (arg[0] == '<') { inputFile = FILE_NAME; @@ -548,7 +548,7 @@ Jim_CreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, int **pid } if (!*input && ++i < argc) { - input = Jim_GetString(argv[i], NULL); + input = Jim_String(argv[i]); } } else if (arg[0] == '>') { @@ -571,7 +571,7 @@ Jim_CreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, int **pid output++; } if (!*output && ++i < argc) { - output = Jim_GetString(argv[i], NULL); + output = Jim_String(argv[i]); } if (dup_error) { errorFile = outputFile; @@ -591,7 +591,7 @@ Jim_CreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, int **pid error++; } if (!*error && ++i < argc) { - error = Jim_GetString(argv[i], NULL); + error = Jim_String(argv[i]); } } else { @@ -179,7 +179,7 @@ static int StoreStatData(Jim_Interp *interp, Jim_Obj *varName, const struct stat static int file_cmd_dirname(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); const char *p = strrchr(path, '/'); if (!p) { @@ -196,7 +196,7 @@ static int file_cmd_dirname(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int file_cmd_rootname(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); const char *lastSlash = strrchr(path, '/'); const char *p = strrchr(path, '.'); @@ -211,7 +211,7 @@ static int file_cmd_rootname(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int file_cmd_extension(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); const char *lastSlash = strrchr(path, '/'); const char *p = strrchr(path, '.'); @@ -224,7 +224,7 @@ static int file_cmd_extension(Jim_Interp *interp, int argc, Jim_Obj *const *argv static int file_cmd_tail(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); const char *lastSlash = strrchr(path, '/'); if (lastSlash) { @@ -239,7 +239,7 @@ static int file_cmd_tail(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int file_cmd_normalize(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { #ifdef HAVE_REALPATH - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); char *newname = Jim_Alloc(MAXPATHLEN + 1); if (realpath(path, newname)) { @@ -306,7 +306,7 @@ static int file_cmd_join(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int file_access(Jim_Interp *interp, Jim_Obj *filename, int mode) { - const char *path = Jim_GetString(filename, NULL); + const char *path = Jim_String(filename); int rc = access(path, mode); Jim_SetResultBool(interp, rc != -1); @@ -337,7 +337,7 @@ static int file_cmd_exists(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int file_cmd_delete(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { while (argc--) { - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); if (unlink(path) == -1 && errno != ENOENT) { if (rmdir(path) == -1) { @@ -409,7 +409,7 @@ static int mkdir_all(char *path) static int file_cmd_mkdir(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { while (argc--) { - char *path = Jim_StrDup(Jim_GetString(argv[0], NULL)); + char *path = Jim_StrDup(Jim_String(argv[0])); int rc = mkdir_all(path); Jim_Free(path); @@ -431,7 +431,7 @@ static int file_cmd_tempfile(Jim_Interp *interp, int argc, Jim_Obj *const *argv) const char *template = "/tmp/tcl.tmp.XXXXXX"; if (argc >= 1) { - template = Jim_GetString(argv[0], NULL); + template = Jim_String(argv[0]); } filename = Jim_StrDup(template); @@ -462,8 +462,8 @@ static int file_cmd_rename(Jim_Interp *interp, int argc, Jim_Obj *const *argv) argc--; } - source = Jim_GetString(argv[0], NULL); - dest = Jim_GetString(argv[1], NULL); + source = Jim_String(argv[0]); + dest = Jim_String(argv[1]); if (!force && access(dest, F_OK) == 0) { Jim_SetResultFormatted(interp, "error renaming \"%#s\" to \"%#s\": target exists", argv[0], @@ -482,7 +482,7 @@ static int file_cmd_rename(Jim_Interp *interp, int argc, Jim_Obj *const *argv) static int file_stat(Jim_Interp *interp, Jim_Obj *filename, struct stat *sb) { - const char *path = Jim_GetString(filename, NULL); + const char *path = Jim_String(filename); if (stat(path, sb) == -1) { Jim_SetResultFormatted(interp, "could not read \"%#s\": %s", filename, strerror(errno)); @@ -497,7 +497,7 @@ static int file_stat(Jim_Interp *interp, Jim_Obj *filename, struct stat *sb) static int file_lstat(Jim_Interp *interp, Jim_Obj *filename, struct stat *sb) { - const char *path = Jim_GetString(filename, NULL); + const char *path = Jim_String(filename); if (lstat(path, sb) == -1) { Jim_SetResultFormatted(interp, "could not read \"%#s\": %s", filename, strerror(errno)); @@ -585,7 +585,7 @@ static int file_cmd_owned(Jim_Interp *interp, int argc, Jim_Obj *const *argv) #if defined(HAVE_READLINK) static int file_cmd_readlink(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { - const char *path = Jim_GetString(argv[0], NULL); + const char *path = Jim_String(argv[0]); char *linkValue = Jim_Alloc(MAXPATHLEN + 1); int linkLength = readlink(path, linkValue, MAXPATHLEN); @@ -828,7 +828,7 @@ static int Jim_CdCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) return JIM_ERR; } - path = Jim_GetString(argv[1], NULL); + path = Jim_String(argv[1]); if (chdir(path) != 0) { Jim_SetResultFormatted(interp, "couldn't change working directory to \"%s\": %s", path, diff --git a/jim-interactive.c b/jim-interactive.c index abef705..90976ce 100644 --- a/jim-interactive.c +++ b/jim-interactive.c @@ -108,7 +108,7 @@ int Jim_InteractivePrompt(Jim_Interp *interp) continue; } - linenoiseHistoryAdd(Jim_GetString(scriptObjPtr, NULL)); + linenoiseHistoryAdd(Jim_String(scriptObjPtr)); linenoiseHistorySave(history_file); #endif retcode = Jim_EvalObj(interp, scriptObjPtr); @@ -83,7 +83,7 @@ static int Jim_LoadCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg Jim_WrongNumArgs(interp, 1, argv, "libaryFile"); return JIM_ERR; } - return Jim_LoadLibrary(interp, Jim_GetString(argv[1], NULL)); + return Jim_LoadLibrary(interp, Jim_String(argv[1])); } int Jim_loadInit(Jim_Interp *interp) @@ -47,7 +47,7 @@ Jim_Nvp *Jim_Nvp_name2value_nocase_simple(const Jim_Nvp * p, const char *name) int Jim_Nvp_name2value_obj(Jim_Interp *interp, const Jim_Nvp * p, Jim_Obj *o, Jim_Nvp ** result) { - return Jim_Nvp_name2value(interp, p, Jim_GetString(o, NULL), result); + return Jim_Nvp_name2value(interp, p, Jim_String(o), result); } @@ -74,7 +74,7 @@ int Jim_Nvp_name2value(Jim_Interp *interp, const Jim_Nvp * _p, const char *name, int Jim_Nvp_name2value_obj_nocase(Jim_Interp *interp, const Jim_Nvp * p, Jim_Obj *o, Jim_Nvp ** puthere) { - return Jim_Nvp_name2value_nocase(interp, p, Jim_GetString(o, NULL), puthere); + return Jim_Nvp_name2value_nocase(interp, p, Jim_String(o), puthere); } int @@ -158,7 +158,7 @@ void Jim_GetOpt_Debug(Jim_GetOptInfo * p) fprintf(stderr, "---args---\n"); for (x = 0; x < p->argc; x++) { - fprintf(stderr, "%2d) %s\n", x, Jim_GetString(p->argv[x], NULL)); + fprintf(stderr, "%2d) %s\n", x, Jim_String(p->argv[x])); } fprintf(stderr, "-------\n"); } @@ -325,10 +325,10 @@ const char *Jim_Debug_ArgvString(Jim_Interp *interp, int argc, Jim_Obj *const *a debug_string_obj = Jim_NewEmptyStringObj(interp); for (x = 0; x < argc; x++) { - Jim_AppendStrings(interp, debug_string_obj, Jim_GetString(argv[x], NULL), " ", NULL); + Jim_AppendStrings(interp, debug_string_obj, Jim_String(argv[x], NULL), " "); } - return Jim_GetString(debug_string_obj, NULL); + return Jim_String(debug_string_obj); } int Jim_nvpInit(Jim_Interp *interp) diff --git a/jim-package.c b/jim-package.c index 7669556..466bf51 100644 --- a/jim-package.c +++ b/jim-package.c @@ -86,7 +86,7 @@ static int JimLoadPackage(Jim_Interp *interp, const char *name, int flags) prefixes[i] = NULL; continue; } - prefixes[i] = Jim_StrDup(Jim_GetString(prefixObjPtr, NULL)); + prefixes[i] = Jim_StrDup(Jim_String(prefixObjPtr)); } /* Scan every directory for the the first match */ @@ -176,9 +176,9 @@ static int package_cmd_provide(Jim_Interp *interp, int argc, Jim_Obj *const *arg const char *version = "1.0"; if (argc == 2) { - version = Jim_GetString(argv[1], NULL); + version = Jim_String(argv[1]); } - return Jim_PackageProvide(interp, Jim_GetString(argv[0], NULL), version, JIM_ERRMSG); + return Jim_PackageProvide(interp, Jim_String(argv[0]), version, JIM_ERRMSG); } /* @@ -199,7 +199,7 @@ static int package_cmd_require(Jim_Interp *interp, int argc, Jim_Obj *const *arg /* package require failing is important enough to add to the stack */ interp->addStackTrace++; - return Jim_PackageRequire(interp, Jim_GetString(argv[0], NULL), JIM_ERRMSG); + return Jim_PackageRequire(interp, Jim_String(argv[0]), JIM_ERRMSG); } /* diff --git a/jim-readdir.c b/jim-readdir.c index cb9ea22..3127efe 100644 --- a/jim-readdir.c +++ b/jim-readdir.c @@ -79,7 +79,7 @@ int Jim_ReaddirCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) return JIM_ERR; } - dirPath = Jim_GetString(argv[1 + nocomplain], NULL); + dirPath = Jim_String(argv[1 + nocomplain]); dirPtr = opendir(dirPath); if (dirPtr == NULL) { diff --git a/jim-readline.c b/jim-readline.c index a224759..3990d0c 100644 --- a/jim-readline.c +++ b/jim-readline.c @@ -32,7 +32,7 @@ static int JimRlReadlineCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar Jim_WrongNumArgs(interp, 1, argv, "prompt"); return JIM_ERR; } - line = readline(Jim_GetString(argv[1], NULL)); + line = readline(Jim_String(argv[1])); if (!line) { return JIM_EXIT; } @@ -46,7 +46,7 @@ static int JimRlAddHistoryCommand(Jim_Interp *interp, int argc, Jim_Obj *const * Jim_WrongNumArgs(interp, 1, argv, "string"); return JIM_ERR; } - add_history(Jim_GetString(argv[1], NULL)); + add_history(Jim_String(argv[1])); return JIM_OK; } diff --git a/jim-regexp.c b/jim-regexp.c index 365785f..702fdfe 100644 --- a/jim-regexp.c +++ b/jim-regexp.c @@ -86,7 +86,7 @@ static regex_t *SetRegexpFromAny(Jim_Interp *interp, Jim_Obj *objPtr, unsigned f } /* Get the string representation */ - pattern = Jim_GetString(objPtr, NULL); + pattern = Jim_String(objPtr); compre = Jim_Alloc(sizeof(regex_t)); if ((ret = regcomp(compre, pattern, REG_EXTENDED | flags)) != 0) { @@ -140,7 +140,7 @@ int Jim_RegexpCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } for (i = 1; i < argc; i++) { - const char *opt = Jim_GetString(argv[i], NULL); + const char *opt = Jim_String(argv[i]); if (*opt != '-') { break; @@ -192,7 +192,7 @@ int Jim_RegexpCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) return JIM_ERR; } - pattern = Jim_GetString(argv[i], NULL); + pattern = Jim_String(argv[i]); source_str = Jim_GetString(argv[i + 1], &source_len); num_vars = argc - i - 2; @@ -369,7 +369,7 @@ int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } for (i = 1; i < argc; i++) { - const char *opt = Jim_GetString(argv[i], NULL); + const char *opt = Jim_String(argv[i]); if (*opt != '-') { break; @@ -412,7 +412,7 @@ int Jim_RegsubCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) if (!regex) { return JIM_ERR; } - pattern = Jim_GetString(argv[i], NULL); + pattern = Jim_String(argv[i]); source_str = Jim_GetString(argv[i + 1], &source_len); replace_str = Jim_GetString(argv[i + 2], &replace_len); @@ -164,7 +164,7 @@ static int JimSdlHandlerCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar Jim_WrongNumArgs(interp, 2, argv, ""); return JIM_ERR; } - Jim_DeleteCommand(interp, Jim_GetString(argv[0], NULL)); + Jim_DeleteCommand(interp, Jim_String(argv[0])); return JIM_OK; } else if (option == OPT_FLIP) { diff --git a/jim-signal.c b/jim-signal.c index 01732dd..c539aa3 100644 --- a/jim-signal.c +++ b/jim-signal.c @@ -194,7 +194,7 @@ static int do_signal_cmd(Jim_Interp *interp, int action, int argc, Jim_Obj *cons /* Iterate through the provided signals */ for (i = 0; i < argc; i++) { - int sig = find_signal_by_name(interp, Jim_GetString(argv[i], NULL)); + int sig = find_signal_by_name(interp, Jim_String(argv[i])); if (sig < 0) { return JIM_ERR; @@ -272,7 +272,7 @@ static int signal_cmd_check(Jim_Interp *interp, int argc, Jim_Obj *const *argv) /* Signals specified */ for (i = clear; i < argc; i++) { - int sig = find_signal_by_name(interp, Jim_GetString(argv[i], NULL)); + int sig = find_signal_by_name(interp, Jim_String(argv[i])); if (sig < 0 || sig >= MAX_SIGNALS) { return -1; @@ -304,7 +304,7 @@ static int signal_cmd_throw(Jim_Interp *interp, int argc, Jim_Obj *const *argv) int sig = SIGINT; if (argc == 1) { - if ((sig = find_signal_by_name(interp, Jim_GetString(argv[0], NULL))) < 0) { + if ((sig = find_signal_by_name(interp, Jim_String(argv[0]))) < 0) { return JIM_ERR; } } @@ -464,7 +464,7 @@ static int Jim_KillCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) pidObj = argv[1]; } else { - signame = Jim_GetString(argv[1], NULL); + signame = Jim_String(argv[1]); pidObj = argv[2]; } diff --git a/jim-sqlite.c b/jim-sqlite.c index 69135dd..a628a99 100644 --- a/jim-sqlite.c +++ b/jim-sqlite.c @@ -148,7 +148,7 @@ static int JimSqliteHandlerCommand(Jim_Interp *interp, int argc, Jim_Obj *const Jim_WrongNumArgs(interp, 2, argv, ""); return JIM_ERR; } - Jim_DeleteCommand(interp, Jim_GetString(argv[0], NULL)); + Jim_DeleteCommand(interp, Jim_String(argv[0])); return JIM_OK; } else if (option == OPT_QUERY) { @@ -161,7 +161,7 @@ static int JimSqliteHandlerCommand(Jim_Interp *interp, int argc, Jim_Obj *const char *nullstr; if (argc >= 4 && Jim_CompareStringImmediate(interp, argv[2], "-null")) { - nullstr = Jim_StrDup(Jim_GetString(argv[3], NULL)); + nullstr = Jim_StrDup(Jim_String(argv[3])); argv += 2; argc -= 2; } @@ -178,7 +178,7 @@ static int JimSqliteHandlerCommand(Jim_Interp *interp, int argc, Jim_Obj *const Jim_Free(nullstr); return JIM_ERR; } - query = Jim_GetString(objPtr, NULL); + query = Jim_String(objPtr); Jim_IncrRefCount(objPtr); /* Compile the query into VM code */ if (sqlite_compile(sh->db, query, &tail, &vm, &errMsg) != SQLITE_OK) { @@ -245,7 +245,7 @@ static int JimSqliteOpenCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar Jim_WrongNumArgs(interp, 1, argv, "dbname"); return JIM_ERR; } - db = sqlite_open(Jim_GetString(argv[1], NULL), 0, &errMsg); + db = sqlite_open(Jim_String(argv[1]), 0, &errMsg); if (db == NULL) { Jim_SetResultString(interp, errMsg, -1); sqlite_freemem(errMsg); diff --git a/jim-sqlite3.c b/jim-sqlite3.c index 5b01eb7..96ff940 100644 --- a/jim-sqlite3.c +++ b/jim-sqlite3.c @@ -148,7 +148,7 @@ static int JimSqliteHandlerCommand(Jim_Interp *interp, int argc, Jim_Obj *const Jim_WrongNumArgs(interp, 2, argv, ""); return JIM_ERR; } - Jim_DeleteCommand(interp, Jim_GetString(argv[0], NULL)); + Jim_DeleteCommand(interp, Jim_String(argv[0])); return JIM_OK; } else if (option == OPT_QUERY) { @@ -160,7 +160,7 @@ static int JimSqliteHandlerCommand(Jim_Interp *interp, int argc, Jim_Obj *const char *nullstr; if (argc >= 4 && Jim_CompareStringImmediate(interp, argv[2], "-null")) { - nullstr = Jim_StrDup(Jim_GetString(argv[3], NULL)); + nullstr = Jim_StrDup(Jim_String(argv[3])); argv += 2; argc -= 2; } @@ -262,7 +262,7 @@ static int JimSqliteOpenCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar Jim_WrongNumArgs(interp, 1, argv, "dbname"); return JIM_ERR; } - r = sqlite3_open(Jim_GetString(argv[1], NULL), &db); + r = sqlite3_open(Jim_String(argv[1]), &db); if (r != SQLITE_OK) { Jim_SetResultString(interp, sqlite3_errmsg(db), -1); sqlite3_close(db); diff --git a/jim-subcmd.c b/jim-subcmd.c index 6e49ca1..2de560a 100644 --- a/jim-subcmd.c +++ b/jim-subcmd.c @@ -38,8 +38,8 @@ static void bad_subcmd(Jim_Interp *interp, const jim_subcmd_type * command_table Jim_Obj *cmd, Jim_Obj *subcmd) { Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - Jim_AppendStrings(interp, Jim_GetResult(interp), Jim_GetString(cmd, NULL), ", ", type, - " command \"", Jim_GetString(subcmd, NULL), "\": should be ", NULL); + Jim_AppendStrings(interp, Jim_GetResult(interp), Jim_String(cmd), ", ", type, + " command \"", Jim_String(subcmd), "\": should be ", NULL); add_commands(interp, command_table, ", "); } @@ -47,7 +47,7 @@ static void show_cmd_usage(Jim_Interp *interp, const jim_subcmd_type * command_t Jim_Obj *const *argv) { Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - Jim_AppendStrings(interp, Jim_GetResult(interp), "Usage: \"", Jim_GetString(argv[0], NULL), + Jim_AppendStrings(interp, Jim_GetResult(interp), "Usage: \"", Jim_String(argv[0]), " command ... \", where command is one of: ", NULL); add_commands(interp, command_table, ", "); } @@ -55,7 +55,7 @@ static void show_cmd_usage(Jim_Interp *interp, const jim_subcmd_type * command_t static void add_cmd_usage(Jim_Interp *interp, const jim_subcmd_type * ct, Jim_Obj *cmd) { if (cmd) { - Jim_AppendStrings(interp, Jim_GetResult(interp), Jim_GetString(cmd, NULL), " ", NULL); + Jim_AppendStrings(interp, Jim_GetResult(interp), Jim_String(cmd), " ", NULL); } Jim_AppendStrings(interp, Jim_GetResult(interp), ct->cmd, NULL); if (ct->args && *ct->args) { @@ -97,7 +97,7 @@ const jim_subcmd_type *Jim_ParseSubCmd(Jim_Interp *interp, const jim_subcmd_type const char *cmdname; int help = 0; - cmdname = Jim_GetString(argv[0], NULL); + cmdname = Jim_String(argv[0]); if (argc < 2) { Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); @@ -283,7 +283,7 @@ Jim_CheckCmdUsage(Jim_Interp *interp, const jim_subcmd_type * command_table, int if (argc - 1 < command_table->minargs || (command_table->maxargs >= 0 && argc - 1 > command_table->maxargs)) { set_wrong_args(interp, command_table, NULL); - Jim_AppendStrings(interp, Jim_GetResult(interp), "\nUse \"", Jim_GetString(argv[0], NULL), + Jim_AppendStrings(interp, Jim_GetResult(interp), "\nUse \"", Jim_String(argv[0]), " -help\" for help", NULL); return JIM_ERR; } diff --git a/jim-syslog.c b/jim-syslog.c index 15b8008..66b3e5e 100644 --- a/jim-syslog.c +++ b/jim-syslog.c @@ -89,7 +89,7 @@ int Jim_SyslogCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) while (i < argc - 1) { if (Jim_CompareStringImmediate(interp, argv[i], "-facility")) { int entry = - Jim_FindByName(Jim_GetString(argv[i + 1], NULL), facilities, + Jim_FindByName(Jim_String(argv[i + 1]), facilities, sizeof(facilities) / sizeof(*facilities)); if (entry < 0) { Jim_SetResultString(interp, "Unknown facility", -1); @@ -116,7 +116,7 @@ int Jim_SyslogCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } } else if (Jim_CompareStringImmediate(interp, argv[i], "-ident")) { - strncpy(info->ident, Jim_GetString(argv[i + 1], NULL), sizeof(info->ident)); + strncpy(info->ident, Jim_String(argv[i + 1]), sizeof(info->ident)); info->ident[sizeof(info->ident) - 1] = 0; if (info->logOpened) { closelog(); @@ -137,7 +137,7 @@ int Jim_SyslogCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) if (i < argc - 1) { priority = - Jim_FindByName(Jim_GetString(argv[i], NULL), priorities, + Jim_FindByName(Jim_String(argv[i]), priorities, sizeof(priorities) / sizeof(*priorities)); if (priority < 0) { Jim_SetResultString(interp, "Unknown priority", -1); @@ -154,7 +154,7 @@ int Jim_SyslogCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) Jim_Obj *argv0 = Jim_GetGlobalVariableStr(interp, "argv0", JIM_NONE); if (argv0) { - strncpy(info->ident, Jim_GetString(argv0, NULL), sizeof(info->ident)); + strncpy(info->ident, Jim_String(argv0), sizeof(info->ident)); } else { strcpy(info->ident, "Tcl script"); @@ -164,7 +164,7 @@ int Jim_SyslogCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv) openlog(info->ident, info->options, info->facility); info->logOpened = 1; } - syslog(priority, "%s", Jim_GetString(argv[i], NULL)); + syslog(priority, "%s", Jim_String(argv[i])); return JIM_OK; } diff --git a/jim-win32.c b/jim-win32.c index 8177d46..e5acf41 100644 --- a/jim-win32.c +++ b/jim-win32.c @@ -83,11 +83,11 @@ Win32_ShellExecute(Jim_Interp *interp, int objc, Jim_Obj * const *objv) Jim_WrongNumArgs(interp, 1, objv, "verb path ?parameters?"); return JIM_ERR; } - verb = Jim_GetString(objv[1], NULL); - file = Jim_GetString(objv[2], NULL); + verb = Jim_String(objv[1]); + file = Jim_String(objv[2]); GetCurrentDirectoryA(MAX_PATH + 1, cwd); if (objc == 4) - parm = Jim_GetString(objv[3], NULL); + parm = Jim_String(objv[3]); r = (int)ShellExecuteA(NULL, verb, file, parm, cwd, SW_SHOWNORMAL); if (r < 33) Jim_SetResult(interp, @@ -108,9 +108,9 @@ Win32_FindWindow(Jim_Interp *interp, int objc, Jim_Obj * const *objv) Jim_WrongNumArgs(interp, 1, objv, "title ?class?"); return JIM_ERR; } - title = Jim_GetString(objv[1], NULL); + title = Jim_String(objv[1]); if (objc == 3) - class = Jim_GetString(objv[2], NULL); + class = Jim_String(objv[2]); hwnd = FindWindowA(class, title); if (hwnd == NULL) { @@ -388,7 +388,7 @@ Win32_SetComputerName(Jim_Interp *interp, int objc, Jim_Obj * const *objv) Jim_WrongNumArgs(interp, 1, objv, "computername"); return JIM_ERR; } - name = Jim_GetString(objv[1], NULL); + name = Jim_String(objv[1]); if (!SetComputerNameA(name)) { Jim_SetResult(interp, Win32ErrorObj(interp, "SetComputerName", GetLastError())); @@ -408,7 +408,7 @@ Win32_GetModuleHandle(Jim_Interp *interp, int objc, Jim_Obj * const *objv) return JIM_ERR; } if (objc == 2) - name = Jim_GetString(objv[1], NULL); + name = Jim_String(objv[1]); hModule = GetModuleHandleA(name); if (hModule == NULL) { Jim_SetResult(interp, @@ -427,7 +427,7 @@ Win32_LoadLibrary(Jim_Interp *interp, int objc, Jim_Obj * const *objv) Jim_WrongNumArgs(interp, 1, objv, "path"); return JIM_ERR; } - hLib = LoadLibraryA(Jim_GetString(objv[1], NULL)); + hLib = LoadLibraryA(Jim_String(objv[1])); if (hLib == NULL) { Jim_SetResult(interp, Win32ErrorObj(interp, "LoadLibrary", GetLastError())); @@ -274,7 +274,7 @@ static int GlobMatch(const char *pattern, const char *string, int nocase) static int JimStringMatch(Jim_Interp *interp, Jim_Obj *patternObj, const char *string, int nocase) { - return GlobMatch(Jim_GetString(patternObj, NULL), string, nocase); + return GlobMatch(Jim_String(patternObj), string, nocase); } /** @@ -2107,7 +2107,7 @@ static void DupStringInternalRep(Jim_Interp *interp, Jim_Obj *srcPtr, Jim_Obj *d static int SetStringFromAny(Jim_Interp *interp, Jim_Obj *objPtr) { /* Get a fresh string representation. */ - (void)Jim_GetString(objPtr, NULL); + (void)Jim_String(objPtr); /* Free any other internal representation. */ Jim_FreeIntRep(interp, objPtr); /* Set it as string, i.e. just set the maxLength field. */ @@ -2281,7 +2281,7 @@ int Jim_StringEqObj(Jim_Obj *aObjPtr, Jim_Obj *bObjPtr) int Jim_StringMatchObj(Jim_Interp *interp, Jim_Obj *patternObjPtr, Jim_Obj *objPtr, int nocase) { - return JimStringMatch(interp, patternObjPtr, Jim_GetString(objPtr, NULL), nocase); + return JimStringMatch(interp, patternObjPtr, Jim_String(objPtr), nocase); } int Jim_StringCompareObj(Jim_Interp *interp, Jim_Obj *firstObjPtr, Jim_Obj *secondObjPtr, int nocase) @@ -2667,7 +2667,7 @@ int Jim_CompareStringImmediate(Jim_Interp *interp, Jim_Obj *objPtr, const char * if (objPtr->typePtr == &comparedStringObjType && objPtr->internalRep.ptr == str) return 1; else { - const char *objStr = Jim_GetString(objPtr, NULL); + const char *objStr = Jim_String(objPtr); if (strcmp(str, objStr) != 0) return 0; @@ -3139,7 +3139,7 @@ static void ScriptObjAddTokens(Jim_Interp *interp, struct ScriptObj *script, printf("==== Script ====\n"); for (i = 0; i < script->len; i++) { const ScriptToken *t = &script->token[i]; - printf("[%2d] %s %s\n", i, jim_tt_name(t->type), Jim_GetString(t->objPtr, NULL)); + printf("[%2d] %s %s\n", i, jim_tt_name(t->type), Jim_String(t->objPtr)); } #endif @@ -3364,7 +3364,7 @@ static int JimCreateProcedure(Jim_Interp *interp, const char *cmdName, Jim_IncrRefCount(initObjPtr); varPtr->linkFramePtr = NULL; if (Jim_AddHashEntry(cmdPtr->staticVars, - Jim_GetString(nameObjPtr, NULL), varPtr) != JIM_OK) { + Jim_String(nameObjPtr), varPtr) != JIM_OK) { Jim_SetResultFormatted(interp, "static variable name \"%#s\" duplicated in statics list", nameObjPtr); Jim_DecrRefCount(interp, initObjPtr); @@ -3472,7 +3472,7 @@ int SetCommandFromAny(Jim_Interp *interp, Jim_Obj *objPtr) const char *cmdName; /* Get the string representation */ - cmdName = Jim_GetString(objPtr, NULL); + cmdName = Jim_String(objPtr); /* Lookup this name into the commands hash table */ he = Jim_FindHashEntry(&interp->commands, cmdName); if (he == NULL) @@ -3661,7 +3661,7 @@ int Jim_SetVariable(Jim_Interp *interp, Jim_Obj *nameObjPtr, Jim_Obj *valObjPtr) } /* New variable to create */ - name = Jim_GetString(nameObjPtr, NULL); + name = Jim_String(nameObjPtr); var = Jim_Alloc(sizeof(*var)); var->objPtr = valObjPtr; @@ -3912,7 +3912,7 @@ int Jim_UnsetVariable(Jim_Interp *interp, Jim_Obj *nameObjPtr, int flags) else { Jim_CallFrame *framePtr = interp->framePtr; - name = Jim_GetString(nameObjPtr, NULL); + name = Jim_String(nameObjPtr); if (name[0] == ':' && name[1] == ':') { framePtr = interp->topFramePtr; name += 2; @@ -4795,7 +4795,7 @@ Jim_CallFrame *Jim_GetCallFrameByLevel(Jim_Interp *interp, Jim_Obj *levelObjPtr) Jim_CallFrame *framePtr; if (levelObjPtr) { - str = Jim_GetString(levelObjPtr, NULL); + str = Jim_String(levelObjPtr); if (str[0] == '#') { char *endptr; @@ -4942,8 +4942,8 @@ static void JimAppendStackTrace(Jim_Interp *interp, const char *procname, && Jim_ListIndex(interp, interp->stackTrace, len - 2, &filenameObj, JIM_NONE) == JIM_OK) { - const char *prev_procname = Jim_GetString(procnameObj, NULL); - const char *prev_filename = Jim_GetString(filenameObj, NULL); + const char *prev_procname = Jim_String(procnameObj); + const char *prev_filename = Jim_String(filenameObj); if (*prev_procname && !*prev_filename) { ListSetIndex(interp, interp->stackTrace, len - 2, Jim_NewStringObj(interp, @@ -5100,7 +5100,7 @@ int SetIntFromAny(Jim_Interp *interp, Jim_Obj *objPtr, int flags) } /* Get the string representation */ - str = Jim_GetString(objPtr, NULL); + str = Jim_String(objPtr); /* Try to convert into a jim_wide */ if (Jim_StringToWide(str, &wideValue, 0) != JIM_OK) { if (flags & JIM_ERRMSG) { @@ -5203,7 +5203,7 @@ int SetDoubleFromAny(Jim_Interp *interp, Jim_Obj *objPtr) /* Preserve the string representation. * Needed so we can convert back to int without loss */ - str = Jim_GetString(objPtr, NULL); + str = Jim_String(objPtr); #ifdef HAVE_LONG_LONG /* Assume a 53 bit mantissa */ @@ -6200,7 +6200,7 @@ static int SetDictFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr) /* Get the string representation. Do this first so we don't * change order in case of fast conversion to dict. */ - Jim_GetString(objPtr, NULL); + Jim_String(objPtr); /* For simplicity, convert a non-list object to a list and then to a dict */ listlen = Jim_ListLength(interp, objPtr); @@ -6498,7 +6498,7 @@ int SetIndexFromAny(Jim_Interp *interp, Jim_Obj *objPtr) char *endptr; /* Get the string representation */ - str = Jim_GetString(objPtr, NULL); + str = Jim_String(objPtr); /* Try to convert into an index */ if (strncmp(str, "end", 3) == 0) { @@ -8296,7 +8296,7 @@ int SetExprFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr) for (i = 0; i < expr->len; i++) { ScriptToken *t = &expr->token[i]; - printf("[%2d] %s '%s'\n", i, jim_tt_name(t->type), Jim_GetString(t->objPtr, NULL)); + printf("[%2d] %s '%s'\n", i, jim_tt_name(t->type), Jim_String(t->objPtr)); } } #endif @@ -9047,7 +9047,7 @@ Jim_Obj *Jim_ScanString(Jim_Interp *interp, Jim_Obj *strObjPtr, Jim_Obj *fmtObjP { size_t i, pos; int scanned = 1; - const char *str = Jim_GetString(strObjPtr, NULL); + const char *str = Jim_String(strObjPtr); int strLen = Jim_Utf8Length(interp, strObjPtr); Jim_Obj *resultList = 0; Jim_Obj **resultVec = 0; @@ -9380,7 +9380,7 @@ static void JimAddErrorToStack(Jim_Interp *interp, int retcode, const char *file if (rc == JIM_ERR && interp->addStackTrace > 0) { /* Add the stack info for the current level */ - JimAppendStackTrace(interp, Jim_GetString(interp->errorProc, NULL), filename, line); + JimAppendStackTrace(interp, Jim_String(interp->errorProc), filename, line); /* Note: if we didn't have a filename for this level, * don't clear the addStackTrace flag @@ -9514,7 +9514,7 @@ static Jim_Obj *JimInterpolateTokens(Jim_Interp *interp, const ScriptToken * tok return NULL; } Jim_IncrRefCount(intv[i]); - Jim_GetString(intv[i], NULL); + Jim_String(intv[i]); totlen += intv[i]->length; } @@ -9820,7 +9820,7 @@ static int JimSetProcArg(Jim_Interp *interp, Jim_Obj *argNameObj, Jim_Obj *argVa { int retcode; /* If argObjPtr begins with '&', do an automatic upvar */ - const char *varname = Jim_GetString(argNameObj, NULL); + const char *varname = Jim_String(argNameObj); if (*varname == '&') { /* First check that the target variable exists */ Jim_Obj *objPtr; @@ -10299,7 +10299,7 @@ static int SetSubstFromAny(Jim_Interp *interp, struct Jim_Obj *objPtr, int flags printf("==== Subst ====\n"); for (i = 0; i < script->len; i++) { printf("[%2d] %s '%s'\n", i, jim_tt_name(script->token[i].type), - Jim_GetString(script->token[i].objPtr, NULL)); + Jim_String(script->token[i].objPtr)); } } #endif @@ -10369,7 +10369,7 @@ static Jim_Obj *JimCommandsList(Jim_Interp *interp, Jim_Obj *patternObjPtr, int Jim_Obj *listObjPtr = Jim_NewListObj(interp, NULL, 0); /* Check for the non-pattern case. We can do this much more efficiently. */ - if (patternObjPtr && JimTrivialMatch(Jim_GetString(patternObjPtr, NULL))) { + if (patternObjPtr && JimTrivialMatch(Jim_String(patternObjPtr))) { Jim_Cmd *cmdPtr = Jim_GetCommand(interp, patternObjPtr, JIM_NONE); if (cmdPtr) { if (type == 1 && cmdPtr->cmdProc) { @@ -10493,11 +10493,11 @@ static int Jim_PutsCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg return JIM_ERR; } else { - fputs(Jim_GetString(argv[2], NULL), stdout); + fputs(Jim_String(argv[2]), stdout); } } else { - puts(Jim_GetString(argv[1], NULL)); + puts(Jim_String(argv[1])); } return JIM_OK; } @@ -11944,7 +11944,7 @@ static int Jim_UplevelCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const * savedCallFrame = interp->framePtr; /* Lookup the target frame pointer */ - str = Jim_GetString(argv[1], NULL); + str = Jim_String(argv[1]); if ((str[0] >= '0' && str[0] <= '9') || str[0] == '#') { targetCallFrame =Jim_GetCallFrameByLevel(interp, argv[1]); argc--; @@ -12171,11 +12171,11 @@ static int Jim_ProcCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg } if (argc == 4) { - return JimCreateProcedure(interp, Jim_GetString(argv[1], NULL), + return JimCreateProcedure(interp, Jim_String(argv[1]), argv[2], NULL, argv[3], leftArity, optionalArgs, args, rightArity); } else { - return JimCreateProcedure(interp, Jim_GetString(argv[1], NULL), + return JimCreateProcedure(interp, Jim_String(argv[1]), argv[2], argv[3], argv[4], leftArity, optionalArgs, args, rightArity); } } @@ -12188,7 +12188,7 @@ static int Jim_LocalCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar /* If OK, and the result is a proc, add it to the list of local procs */ if (retcode == 0) { - const char *procname = Jim_GetString(Jim_GetResult(interp), NULL); + const char *procname = Jim_String(Jim_GetResult(interp)); if (Jim_FindHashEntry(&interp->commands, procname) == NULL) { Jim_SetResultFormatted(interp, "not a proc: \"%s\"", procname); @@ -12281,7 +12281,7 @@ static Jim_Obj *JimStringMap(Jim_Interp *interp, Jim_Obj *mapListObjPtr, return NULL; } - str = Jim_GetString(objPtr, NULL); + str = Jim_String(objPtr); strLen = Jim_Utf8Length(interp, objPtr); /* Map it */ @@ -12293,7 +12293,7 @@ static Jim_Obj *JimStringMap(Jim_Interp *interp, Jim_Obj *mapListObjPtr, int kl; Jim_ListIndex(interp, mapListObjPtr, i, &objPtr, JIM_NONE); - k = Jim_GetString(objPtr, NULL); + k = Jim_String(objPtr); kl = Jim_Utf8Length(interp, objPtr); if (strLen >= kl && kl) { @@ -12510,7 +12510,7 @@ static int Jim_StringCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a if (Jim_GetIndex(interp, argv[3], &idx) != JIM_OK) { return JIM_ERR; } - str = Jim_GetString(argv[2], NULL); + str = Jim_String(argv[2]); len = Jim_Utf8Length(interp, argv[2]); if (idx != INT_MIN && idx != INT_MAX) { idx = JimRelToAbsIndex(len, idx); @@ -12539,8 +12539,8 @@ static int Jim_StringCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a Jim_WrongNumArgs(interp, 2, argv, "subString string ?index?"); return JIM_ERR; } - s1 = Jim_GetString(argv[2], NULL); - s2 = Jim_GetString(argv[3], NULL); + s1 = Jim_String(argv[2]); + s2 = Jim_String(argv[3]); l1 = Jim_Utf8Length(interp, argv[2]); l2 = Jim_Utf8Length(interp, argv[3]); if (argc == 5) { @@ -12679,7 +12679,7 @@ static int Jim_CatchCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar Jim_SetGlobalVariableStr(interp, "errorCode", Jim_NewStringObj(interp, "NONE", -1)); for (i = 1; i < argc - 1; i++) { - const char *arg = Jim_GetString(argv[i], NULL); + const char *arg = Jim_String(argv[i]); jim_wide option; int add; @@ -12915,8 +12915,8 @@ static int Jim_RenameCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a return JIM_ERR; } - oldName = Jim_GetString(argv[1], NULL); - newName = Jim_GetString(argv[2], NULL); + oldName = Jim_String(argv[1]); + newName = Jim_String(argv[2]); return Jim_RenameCommand(interp, oldName, newName); } @@ -13412,7 +13412,7 @@ static int Jim_SplitCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *ar splitLen = 4; } else { - splitChars = Jim_GetString(argv[2], NULL); + splitChars = Jim_String(argv[2]); splitLen = Jim_Utf8Length(interp, argv[2]); } @@ -13696,14 +13696,14 @@ static int Jim_EnvCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv Jim_WrongNumArgs(interp, 1, argv, "varName ?default?"); return JIM_ERR; } - key = Jim_GetString(argv[1], NULL); + key = Jim_String(argv[1]); val = getenv(key); if (val == NULL) { if (argc < 3) { Jim_SetResultFormatted(interp, "environment variable \"%#s\" does not exist", argv[1]); return JIM_ERR; } - val = Jim_GetString(argv[2], NULL); + val = Jim_String(argv[2]); } Jim_SetResult(interp, Jim_NewStringObj(interp, val, -1)); return JIM_OK; @@ -13718,7 +13718,7 @@ static int Jim_SourceCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *a Jim_WrongNumArgs(interp, 1, argv, "fileName"); return JIM_ERR; } - retval = Jim_EvalFile(interp, Jim_GetString(argv[1], NULL)); + retval = Jim_EvalFile(interp, Jim_String(argv[1])); if (retval == JIM_RETURN) return JIM_OK; return retval; @@ -564,6 +564,7 @@ typedef struct Jim_Interp { #define Jim_SetEmptyResult(i) Jim_SetResult(i, (i)->emptyObj) #define Jim_GetResult(i) ((i)->result) #define Jim_CmdPrivData(i) ((i)->cmdPrivData) +#define Jim_String(o) Jim_GetString((o), NULL) /* Note that 'o' is expanded only one time inside this macro, * so it's safe to use side effects. */ @@ -79,7 +79,7 @@ int main(int argc, char *const argv[]) /* Register static extensions */ if (Jim_InitStaticExtensions(interp) != JIM_OK) { Jim_MakeErrorMessage(interp); - fprintf(stderr, "%s\n", Jim_GetString(Jim_GetResult(interp), NULL)); + fprintf(stderr, "%s\n", Jim_String(Jim_GetResult(interp))); } Jim_SetVariableStrWithStr(interp, "jim_argv0", argv[0]); @@ -89,7 +89,7 @@ int main(int argc, char *const argv[]) if (argc == 1) { if (retcode == JIM_ERR) { Jim_MakeErrorMessage(interp); - fprintf(stderr, "%s\n", Jim_GetString(Jim_GetResult(interp), NULL)); + fprintf(stderr, "%s\n", Jim_String(Jim_GetResult(interp))); } if (retcode != JIM_EXIT) { JimSetArgv(interp, 0, NULL); @@ -101,7 +101,7 @@ int main(int argc, char *const argv[]) JimSetArgv(interp, argc - 3, argv + 3); retcode = Jim_Eval(interp, argv[2]); if (retcode != JIM_ERR) { - printf("%s\n", Jim_GetString(Jim_GetResult(interp), NULL)); + printf("%s\n", Jim_String(Jim_GetResult(interp))); } } else { @@ -111,7 +111,7 @@ int main(int argc, char *const argv[]) } if (retcode == JIM_ERR) { Jim_MakeErrorMessage(interp); - fprintf(stderr, "%s\n", Jim_GetString(Jim_GetResult(interp), NULL)); + fprintf(stderr, "%s\n", Jim_String(Jim_GetResult(interp))); } } if (retcode == JIM_EXIT) { |