From ca1d944f40971c53a76c5bdf2c45f277acfc2e0e Mon Sep 17 00:00:00 2001 From: Steve Bennett Date: Mon, 30 May 2011 17:41:41 +1000 Subject: Add Jim_String() macro It is very common to get the string value without the length. Jim_String() is a macro which does that. Signed-off-by: Steve Bennett --- jim-sqlite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jim-sqlite.c') 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); -- cgit v1.1