diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-19 18:48:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-19 18:48:35 (GMT) |
| commit | 6eac416e1dac9fc63b8ad41757cc3b4cf1965b82 (patch) | |
| tree | 364627b4ae36382dee748096f92f74b1977d4ae8 /generic/tclZipfs.c | |
| parent | 12f22db7d88ada7a15f6c0371b6dc49ef02d698d (diff) | |
| parent | 9d3abb8846c9436ab40ac8ed9ecbaa9195f6e1f2 (diff) | |
| download | tcl-6eac416e1dac9fc63b8ad41757cc3b4cf1965b82.zip tcl-6eac416e1dac9fc63b8ad41757cc3b4cf1965b82.tar.gz tcl-6eac416e1dac9fc63b8ad41757cc3b4cf1965b82.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclZipfs.c')
| -rw-r--r-- | generic/tclZipfs.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index bc7bd06..42d36c4 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -56,7 +56,7 @@ if (interp) { \ Tcl_SetObjResult(interp, Tcl_NewStringObj( \ "out of memory", -1)); \ - Tcl_SetErrorCode(interp, "TCL", "MALLOC", NULL); \ + Tcl_SetErrorCode(interp, "TCL", "MALLOC", (void *)NULL); \ } \ } while (0) #define ZIPFS_POSIX_ERROR(interp,errstr) \ @@ -69,7 +69,7 @@ #define ZIPFS_ERROR_CODE(interp,errcode) \ do { \ if (interp) { \ - Tcl_SetErrorCode(interp, "TCL", "ZIPFS", errcode, NULL); \ + Tcl_SetErrorCode(interp, "TCL", "ZIPFS", errcode, (void *)NULL); \ } \ } while (0) @@ -167,15 +167,6 @@ static const z_crc_t* crc32tab; #define DEFAULT_WRITE_MAX_SIZE ZIP_MAX_FILE_SIZE /* - * Windows drive letters. - */ - -#ifdef _WIN32 -static const char drvletters[] = - "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; -#endif /* _WIN32 */ - -/* * Mutex to protect localtime(3) when no reentrant version available. */ @@ -2355,7 +2346,7 @@ TclZipfs_Mount( Tcl_SetObjResult( interp, Tcl_ObjPrintf("could not normalize zip filename \"%s\"", zipname)); - Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NORMALIZE", NULL); + Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NORMALIZE", (void *)NULL); ret = TCL_ERROR; } else { Tcl_IncrRefCount(normZipPathObj); |