diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-16 11:24:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-16 11:24:21 (GMT) |
| commit | 4f523fda09b2d21bf1b830e0258a4f489d4a8df4 (patch) | |
| tree | 6cc13d579aa8920a7ca0b70ac9b8bcdade0eedac /generic/tclIO.c | |
| parent | 516f8e365dd94bfc9af0fb2d86516cae5bb2ec7f (diff) | |
| parent | ad3c0d8addcd132eb23ae96bcc21ce59458cb67a (diff) | |
| download | tcl-4f523fda09b2d21bf1b830e0258a4f489d4a8df4.zip tcl-4f523fda09b2d21bf1b830e0258a4f489d4a8df4.tar.gz tcl-4f523fda09b2d21bf1b830e0258a4f489d4a8df4.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclIO.c')
| -rw-r--r-- | generic/tclIO.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c index a76aba3..ea6c2d7 100644 --- a/generic/tclIO.c +++ b/generic/tclIO.c @@ -4431,14 +4431,12 @@ Tcl_Gets( * for managing the storage. */ { Tcl_Obj *objPtr; - int charsStored, length; - const char *string; + int charsStored; TclNewObj(objPtr); charsStored = Tcl_GetsObj(chan, objPtr); if (charsStored > 0) { - string = TclGetStringFromObj(objPtr, &length); - Tcl_DStringAppend(lineRead, string, length); + TclDStringAppendObj(lineRead, objPtr); } TclDecrRefCount(objPtr); return charsStored; @@ -7550,7 +7548,7 @@ Tcl_BadChannelOption( Tcl_DStringInit(&ds); Tcl_DStringAppend(&ds, genericopt, -1); if (optionList && (*optionList)) { - Tcl_DStringAppend(&ds, " ", 1); + TclDStringAppendLiteral(&ds, " "); Tcl_DStringAppend(&ds, optionList, -1); } if (Tcl_SplitList(interp, Tcl_DStringValue(&ds), |