diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-11 14:10:33 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-01-11 14:10:33 (GMT) |
commit | a570984b2aff26b6147c3b820666524416b008ed (patch) | |
tree | f636724aecc907dd7b3bb8c60415956a0afb762e /generic/tclBasic.c | |
parent | fc84850b75bc0741998145b52bbe2269c2d76e8d (diff) | |
parent | 106bb8e542d3f2faddd22387c1507895837a01ab (diff) | |
download | tcl-a570984b2aff26b6147c3b820666524416b008ed.zip tcl-a570984b2aff26b6147c3b820666524416b008ed.tar.gz tcl-a570984b2aff26b6147c3b820666524416b008ed.tar.bz2 |
Merge core-8-6-branch.
Do gcc-compiles with the option -Wwrite-strings, so we can detect mis-usage of "const".
Make Tcl_AddErrorInfo() and Tcl_AddObjErrorInfo() a macro.
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r-- | generic/tclBasic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 81b3513..37dd699 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -6702,11 +6702,10 @@ Tcl_AppendObjToErrorInfo( * pertains. */ Tcl_Obj *objPtr) /* Message to record. */ { - int length; - const char *message = TclGetStringFromObj(objPtr, &length); + const char *message = TclGetString(objPtr); Tcl_IncrRefCount(objPtr); - Tcl_AddObjErrorInfo(interp, message, length); + Tcl_AddObjErrorInfo(interp, message, objPtr->length); Tcl_DecrRefCount(objPtr); } |