From d6f93ff4501e5cb46711b621010a5fa27a4908fc Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 4 Sep 2025 09:33:13 +0000 Subject: Fix some -Wconversion warnings --- unix/tclUnixTest.c | 7 ++++--- win/tclWinChan.c | 2 +- win/tclWinFile.c | 4 ++-- win/tclWinTest.c | 7 ++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/unix/tclUnixTest.c b/unix/tclUnixTest.c index 46e2db9..55f49d7 100644 --- a/unix/tclUnixTest.c +++ b/unix/tclUnixTest.c @@ -32,7 +32,7 @@ */ #define MakeFile(fd) ((TclFile)INT2PTR(((int)(fd))+1)) -#define GetFd(file) (PTR2INT(file)-1) +#define GetFd(file) ((int)PTR2INT(file)-1) /* * The stuff below is used to keep track of file handlers created and @@ -380,7 +380,7 @@ TestfilewaitCmd( Tcl_AppendResult(interp, "couldn't get channel file", (char *)NULL); return TCL_ERROR; } - fd = PTR2INT(data); + fd = (int)PTR2INT(data); if (Tcl_GetIntFromObj(interp, objv[3], &timeout) != TCL_OK) { return TCL_ERROR; } @@ -615,7 +615,8 @@ TestchmodCmd( int objc, /* Number of arguments. */ Tcl_Obj *const *objv) /* Argument strings. */ { - int i, mode; + Tcl_Size i; + int mode; Tcl_DString ds; if (objc < 2) { diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 599d6e3..8ebdc31 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -837,7 +837,7 @@ StatOpenFile( { DWORD attr; int dev, nlink = 1; - unsigned short mode; + int mode; unsigned long long size, inode; long long atime, ctime, mtime; BY_HANDLE_FILE_INFORMATION data; diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 32547ff..88f3111 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -2043,7 +2043,7 @@ NativeStat( { DWORD attr; int dev, nlink = 1; - unsigned short mode; + int mode; unsigned int inode = 0; HANDLE fileHandle; DWORD fileType = FILE_TYPE_UNKNOWN; @@ -2161,7 +2161,7 @@ NativeStat( statPtr->st_dev = (dev_t) dev; statPtr->st_ino = (_ino_t)inode; - statPtr->st_mode = mode; + statPtr->st_mode = (mode_t)mode; statPtr->st_nlink = (short)nlink; statPtr->st_uid = 0; statPtr->st_gid = 0; diff --git a/win/tclWinTest.c b/win/tclWinTest.c index ad82d0a..b95978e 100644 --- a/win/tclWinTest.c +++ b/win/tclWinTest.c @@ -568,8 +568,8 @@ TestplatformChmod( newAclSize = sizeof(ACL); /* Add in size required for each ACE entry in the ACL */ for (i = 0; i < nSids; ++i) { - newAclSize += - (DWORD)offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen; + newAclSize += (DWORD) + offsetof(ACCESS_ALLOWED_ACE, SidStart) + aceEntry[i].sidLen; } newAcl = (PACL)Tcl_Alloc(newAclSize); if (!InitializeAcl(newAcl, newAclSize, ACL_REVISION)) { @@ -641,7 +641,8 @@ TestchmodCmd( int objc, /* Parameter count */ Tcl_Obj *const * objv) /* Parameter vector */ { - int i, mode; + Tcl_Size i; + int mode; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "mode file ?file ...?"); -- cgit v0.12