diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-29 19:41:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-05-29 19:41:08 (GMT) |
| commit | af838a5d529d837dc588e5c57d07d94dd612afcc (patch) | |
| tree | 6900f1dd2e2d0b0c66f05ad17d704e6002e0dc5e | |
| parent | 69ae2a0f039e827976e6af9b7b2047473fa9f647 (diff) | |
| parent | 8091425c93b8846adbfd2667a6b30120241d1552 (diff) | |
| download | tcl-af838a5d529d837dc588e5c57d07d94dd612afcc.zip tcl-af838a5d529d837dc588e5c57d07d94dd612afcc.tar.gz tcl-af838a5d529d837dc588e5c57d07d94dd612afcc.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | doc/configurable.n | 2 | ||||
| -rw-r--r-- | generic/tclOOScript.h | 2 | ||||
| -rw-r--r-- | unix/tclUnixChan.c | 6 | ||||
| -rw-r--r-- | win/tclWinChan.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/configurable.n b/doc/configurable.n index ef888ed..0102f8c 100644 --- a/doc/configurable.n +++ b/doc/configurable.n @@ -146,7 +146,7 @@ so that they can be used by other code: .TP \fBoo::configuresupport::configurable\fR . -This is a class that provids the implementation of the \fBconfigure\fR method +This is a class that provides the implementation of the \fBconfigure\fR method (described above in \fBCONFIGURE METHOD\fR). .TP \fBoo::configuresupport::configurableclass\fR diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h index 407e919..b7c1f1d 100644 --- a/generic/tclOOScript.h +++ b/generic/tclOOScript.h @@ -19,7 +19,7 @@ /* * The scripted part of the definitions of TclOO. * - * Compiled from generic/tclOOScript.tcl by tools/makeHeader.tcl, which + * Compiled from tools/tclOOScript.tcl by tools/makeHeader.tcl, which * contains the commented version of everything; *this* file is automatically * generated. */ diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index 62c3be9..c99c3fb 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -278,7 +278,7 @@ FileInputProc( */ do { - bytesRead = read(fsPtr->fd, buf, toRead); + bytesRead = read(fsPtr->fd, buf, (size_t)toRead); } while ((bytesRead < 0) && (errno == EINTR)); if (bytesRead < 0) { @@ -327,7 +327,7 @@ FileOutputProc( return 0; } - written = write(fsPtr->fd, buf, toWrite); + written = write(fsPtr->fd, buf, (size_t)toWrite); if (written >= 0) { return written; } @@ -679,7 +679,7 @@ FileGetOptionProc( if ((len > 1) && (strncmp(optionName, "-stat", len) == 0)) { Tcl_Obj *dictObj = StatOpenFile(fsPtr); const char *dictContents; - int dictLength; + Tcl_Size dictLength; if (dictObj == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 620c75f..d242f3d 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -923,7 +923,7 @@ FileGetOptionProc( if (valid) { Tcl_Obj *dictObj = StatOpenFile(infoPtr); const char *dictContents; - int dictLength; + Tcl_Size dictLength; if (dictObj == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( |