aboutsummaryrefslogtreecommitdiff
path: root/jim-nvp.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-nvp.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-nvp.c')
-rw-r--r--jim-nvp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/jim-nvp.c b/jim-nvp.c
index 01bf932..b6f3c87 100644
--- a/jim-nvp.c
+++ b/jim-nvp.c
@@ -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)