summaryrefslogtreecommitdiffstats
path: root/generic/tclScan.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-06-23 22:22:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-06-23 22:22:39 (GMT)
commitdd86878ece9accdecdd6aa124e08b2a255da55b7 (patch)
tree76094fc43d096a758df3a6d5fb14e102ab3d80b5 /generic/tclScan.c
parent99ec0939cf2a6ead9546a36c42a3224eaf050f59 (diff)
parent17d4aee3e5d53fff38c2f5b3320feb6aae327e2b (diff)
downloadtcl-dd86878ece9accdecdd6aa124e08b2a255da55b7.zip
tcl-dd86878ece9accdecdd6aa124e08b2a255da55b7.tar.gz
tcl-dd86878ece9accdecdd6aa124e08b2a255da55b7.tar.bz2
merge trunk
Diffstat (limited to 'generic/tclScan.c')
-rw-r--r--generic/tclScan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c
index ec54ddb..51628b9 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -595,7 +595,7 @@ Tcl_ScanObjCmd(
return TCL_ERROR;
}
- format = Tcl_GetStringFromObj(objv[2], NULL);
+ format = Tcl_GetString(objv[2]);
numVars = objc-3;
/*
@@ -617,7 +617,7 @@ Tcl_ScanObjCmd(
}
}
- string = Tcl_GetStringFromObj(objv[1], NULL);
+ string = Tcl_GetString(objv[1]);
baseString = string;
/*