aboutsummaryrefslogtreecommitdiff
path: root/jim-win32.c
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2011-05-30 17:41:41 +1000
committerSteve Bennett <steveb@workware.net.au>2011-06-01 09:43:25 +1000
commitca1d944f40971c53a76c5bdf2c45f277acfc2e0e (patch)
treec780e408eb39014fbb8b8d70216993bccea55979 /jim-win32.c
parent878a8fdb576ab96d6e8c497e4dffedf82a9afbcf (diff)
downloadjimtcl-ca1d944f40971c53a76c5bdf2c45f277acfc2e0e.zip
jimtcl-ca1d944f40971c53a76c5bdf2c45f277acfc2e0e.tar.gz
jimtcl-ca1d944f40971c53a76c5bdf2c45f277acfc2e0e.tar.bz2
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 <steveb@workware.net.au>
Diffstat (limited to 'jim-win32.c')
-rw-r--r--jim-win32.c16
1 files changed, 8 insertions, 8 deletions
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()));