summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-22 13:12:30 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-22 13:12:30 (GMT)
commit9bd7291d76ec04a45794340cf61d59f2f9a3b856 (patch)
tree630919de7c740038508186e8463785c7bc2b8c37 /generic
parentf6f5bda1ed51222fa2d20499b0ce0dc635851a81 (diff)
parent37fed625022a173be5f37951385e9633fb86deb1 (diff)
downloadtcl-9bd7291d76ec04a45794340cf61d59f2f9a3b856.zip
tcl-9bd7291d76ec04a45794340cf61d59f2f9a3b856.tar.gz
tcl-9bd7291d76ec04a45794340cf61d59f2f9a3b856.tar.bz2
merge trunk
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclInterp.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 91cd83c..f6d757c 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -6141,7 +6141,7 @@ Tcl_AddErrorInfo(
* pertains. */
const char *message) /* Message to record. */
{
- Tcl_AppendObjToErrorInfo((interp), Tcl_NewStringObj((message), -1));
+ Tcl_AppendObjToErrorInfo((interp), Tcl_NewStringObj(message, -1));
}
/*
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index 513310e..aaf4b33 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -1882,7 +1882,6 @@ AliasObjCmd(
cmdv = TclStackAlloc(interp, cmdc * sizeof(Tcl_Obj *));
}
- prefv = &aliasPtr->objPtr;
memcpy(cmdv, prefv, (size_t) (prefc * sizeof(Tcl_Obj *)));
memcpy(cmdv+prefc, objv+1, (size_t) ((objc-1) * sizeof(Tcl_Obj *)));