Tcl Source Code

Check-in [f24df1717c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merge trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | novem
Files: files | file ages | folders
SHA1: f24df1717ce8813f61dba1d7d6d80b732e847613
User & Date: jan.nijtmans 2014-04-07 14:56:30
Context
2014-04-15
10:46
merge trunk check-in: 4b651b011f user: jan.nijtmans tags: novem
10:44
merge trunk Closed-Leaf check-in: 0d229dab98 user: jan.nijtmans tags: mistake
2014-04-07
14:56
merge trunk check-in: f24df1717c user: jan.nijtmans tags: novem
14:32
Merge-mark: Those two test-cases will arrive in trunk as soon as branch [http://core.tcl.tk/tcl/time... check-in: a006f5a452 user: jan.nijtmans tags: trunk
2014-03-31
18:47
merge trunk check-in: 33f13ba67c user: jan.nijtmans tags: novem
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/tclIO.c.

3266
3267
3268
3269
3270
3271
3272








3273


3274
3275
3276
3277
3278
3279
3280

    if (stickyError != 0) {
	Tcl_SetErrno(stickyError);
	if (interp != NULL) {
	    Tcl_SetObjResult(interp,
			     Tcl_NewStringObj(Tcl_PosixError(interp), -1));
	}








	flushcode = -1;


    }
    if ((flushcode != 0) || (result != 0)) {
	return TCL_ERROR;
    }
    return TCL_OK;
}








>
>
>
>
>
>
>
>
|
>
>







3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290

    if (stickyError != 0) {
	Tcl_SetErrno(stickyError);
	if (interp != NULL) {
	    Tcl_SetObjResult(interp,
			     Tcl_NewStringObj(Tcl_PosixError(interp), -1));
	}
	return TCL_ERROR;
    }
    /*
     * Bug 97069ea11a: set error message if a flush code is set and no error
     * message set up to now.
     */
    if (flushcode != 0 && interp != NULL
	    && 0 == Tcl_GetCharLength(Tcl_GetObjResult(interp)) ) {
	Tcl_SetErrno(flushcode);
	Tcl_SetObjResult(interp,
		Tcl_NewStringObj(Tcl_PosixError(interp), -1));
    }
    if ((flushcode != 0) || (result != 0)) {
	return TCL_ERROR;
    }
    return TCL_OK;
}