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 | 6a4aafe17fbc322b30ef749f7321a6ae959dc396 (patch) | |
| tree | 75ee68f89422b10ec42523bafa46fae061c6489d /generic/tclFileName.c | |
| parent | 1f3c9596a6b416e667c32e43484991d7d0b9b4d7 (diff) | |
| parent | eb2cc1a749241d99c8e1f9df959b79a2fdbe8684 (diff) | |
| download | tcl-6a4aafe17fbc322b30ef749f7321a6ae959dc396.zip tcl-6a4aafe17fbc322b30ef749f7321a6ae959dc396.tar.gz tcl-6a4aafe17fbc322b30ef749f7321a6ae959dc396.tar.bz2 | |
Merge 8.7, and continue implementation. Almost done
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 3ed16a4..dfdb943 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -587,7 +587,7 @@ Tcl_SplitPath( * plus the argv pointers and the terminating NULL pointer. */ - *argvPtr = ckalloc((((*argcPtr) + 1) * sizeof(char *)) + size); + *argvPtr = (const char **)ckalloc((((*argcPtr) + 1) * sizeof(char *)) + size); /* * Position p after the last argv pointer and copy the contents of the @@ -821,7 +821,7 @@ Tcl_FSJoinToPath( return TclJoinPath(2, pair, 0); } else { int elemc = objc + 1; - Tcl_Obj *ret, **elemv = ckalloc(elemc*sizeof(Tcl_Obj *)); + Tcl_Obj *ret, **elemv = (Tcl_Obj**)ckalloc(elemc*sizeof(Tcl_Obj *)); elemv[0] = pathPtr; memcpy(elemv+1, objv, objc*sizeof(Tcl_Obj *)); @@ -2523,7 +2523,7 @@ DoGlob( Tcl_StatBuf * Tcl_AllocStatBuf(void) { - return ckalloc(sizeof(Tcl_StatBuf)); + return (Tcl_StatBuf *)ckalloc(sizeof(Tcl_StatBuf)); } /* |