diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-05 11:24:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-05 11:24:01 (GMT) |
| commit | 1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15 (patch) | |
| tree | 68c0928c9826b336819d0766769d6dccc0ce3103 | |
| parent | 2b64ea7f2470e4727e2d79c041ba0028371c7a9e (diff) | |
| parent | 22a204efc2b5de6e1fd336e14c6350e5f8ceb9a8 (diff) | |
| download | tcl-1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15.zip tcl-1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15.tar.gz tcl-1ac5bc1c98b345bfcc00d037828fc5cf0ca93b15.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclBasic.c | 8 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 8 | ||||
| -rw-r--r-- | tests/zipfs.test | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 4f43ca5..83f6b4e 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -69,7 +69,7 @@ * compatible with AddressSanitizer (ASan) use-after-return detection. */ -#if defined(HAVE_INTRIN_H) +#if defined(_MSC_VER) && defined(HAVE_INTRIN_H) #include <intrin.h> /* for _AddressOfReturnAddress() */ #endif @@ -84,10 +84,10 @@ void * TclGetCStackPtr(void) { -#if defined(HAVE_INTRIN_H) - return _AddressOfReturnAddress(); -#elif __GNUC__ || __has_builtin(__builtin_frame_address) +#if defined( __GNUC__ ) || __has_builtin(__builtin_frame_address) return __builtin_frame_address(0); +#elif defined(_MSC_VER) && defined(HAVE_INTRIN_H) + return _AddressOfReturnAddress(); #else ptrdiff_t unused = 0; /* diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index f2bdaa9..25929d1 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -244,13 +244,13 @@ typedef struct ZipEntry { } ZipEntry; /* - * File channel for file contained in mounted ZIP archive. + * File channel for file contained in mounted ZIP archive. * - * Regarding data buffers: + * Regarding data buffers: * For READ-ONLY files that are not encrypted and not compressed (zip STORE * method), ubuf points directly to the mapped zip file data in memory. No - * additional storage is allocated and so ubufToFree is NULL. - * + * additional storage is allocated and so ubufToFree is NULL. + * * In all other combinations of compression and encryption or if channel is * writable, storage is allocated for the decrypted and/or uncompressed data * and a pointer to it is stored in ubufToFree and ubuf. When channel is diff --git a/tests/zipfs.test b/tests/zipfs.test index 37f8156..6d5d461 100644 --- a/tests/zipfs.test +++ b/tests/zipfs.test @@ -1123,7 +1123,7 @@ namespace eval test_ns_zipfs { close $fd file size [file join $defMountPt test] } -result 10000000 - + test zipfs-write-size-limit-3 "Writes incrementally - buffer growth" -setup { mount [zippath test.zip] } -cleanup { |