diff options
author | Steve Bennett <steveb@workware.net.au> | 2011-05-30 17:41:41 +1000 |
---|---|---|
committer | Steve Bennett <steveb@workware.net.au> | 2011-06-01 09:43:25 +1000 |
commit | ca1d944f40971c53a76c5bdf2c45f277acfc2e0e (patch) | |
tree | c780e408eb39014fbb8b8d70216993bccea55979 /jim-syslog.c | |
parent | 878a8fdb576ab96d6e8c497e4dffedf82a9afbcf (diff) | |
download | jimtcl-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-syslog.c')
-rw-r--r-- | jim-syslog.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |