diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-10 05:51:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-10 05:51:56 (GMT) |
| commit | 2a3d586a796e62f522303b3ab71c84743a73bf89 (patch) | |
| tree | 75ee68f89422b10ec42523bafa46fae061c6489d /generic/tclPathObj.c | |
| parent | d409a29e57b2d4ced1bad4b0bb5bb1e2387f4120 (diff) | |
| parent | 6cf70a8d484881c9886d7d0cd5d2b9b6feac10fb (diff) | |
| download | tcl-2a3d586a796e62f522303b3ab71c84743a73bf89.zip tcl-2a3d586a796e62f522303b3ab71c84743a73bf89.tar.gz tcl-2a3d586a796e62f522303b3ab71c84743a73bf89.tar.bz2 | |
Merge 8.7, and continue implementation. Almost done
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 3703aaf..51659ee 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -1290,7 +1290,7 @@ TclNewFSPathObj( } pathPtr = Tcl_NewObj(); - fsPathPtr = ckalloc(sizeof(FsPath)); + fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath)); /* * Set up the path. @@ -1482,7 +1482,7 @@ MakePathFromNormalized( return TCL_OK; } - fsPathPtr = ckalloc(sizeof(FsPath)); + fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath)); /* * It's a pure normalized absolute path. @@ -1550,7 +1550,7 @@ Tcl_FSNewNativePath( */ Tcl_StoreIntRep(pathPtr, &fsPathType, NULL); - fsPathPtr = ckalloc(sizeof(FsPath)); + fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath)); fsPathPtr->translatedPathPtr = NULL; @@ -1677,7 +1677,7 @@ Tcl_FSGetTranslatedStringPath( if (transPtr != NULL) { int len; const char *orig = TclGetStringFromObj(transPtr, &len); - char *result = ckalloc(len+1); + char *result = (char *)ckalloc(len+1); memcpy(result, orig, len+1); TclDecrRefCount(transPtr); @@ -2050,7 +2050,7 @@ Tcl_FSGetInternalRep( return NULL; } - nativePathPtr = proc(pathPtr); + nativePathPtr = (char *)proc(pathPtr); srcFsPathPtr = PATHOBJ(pathPtr); srcFsPathPtr->nativePathPtr = nativePathPtr; } @@ -2384,7 +2384,7 @@ SetFsPathFromAny( * slashes on Windows, and will not contain any ~user sequences. */ - fsPathPtr = ckalloc(sizeof(FsPath)); + fsPathPtr = (FsPath *)ckalloc(sizeof(FsPath)); if (transPtr == pathPtr) { transPtr = Tcl_DuplicateObj(pathPtr); @@ -2444,7 +2444,7 @@ DupFsPathInternalRep( Tcl_Obj *copyPtr) /* Path obj with internal rep to set. */ { FsPath *srcFsPathPtr = PATHOBJ(srcPtr); - FsPath *copyFsPathPtr = ckalloc(sizeof(FsPath)); + FsPath *copyFsPathPtr = (FsPath *)ckalloc(sizeof(FsPath)); SETPATHOBJ(copyPtr, copyFsPathPtr); |