summaryrefslogtreecommitdiffstats
path: root/generic/tclZipfs.c
diff options
context:
space:
mode:
authorapnadkarni <apnmbx-wits@yahoo.com>2024-05-24 16:05:19 (GMT)
committerapnadkarni <apnmbx-wits@yahoo.com>2024-05-24 16:05:19 (GMT)
commitb7eeffcdef4802086b4f43db1619b2784d74aa79 (patch)
tree0e5d90abdf8a9e69a0fc4383d8ceac9d115a02c4 /generic/tclZipfs.c
parent14145609e7b52c939ce5bc328b87b8ab02c7a431 (diff)
parentb230de2a4d3e8748a542c21d0dfde9e357ac0b0a (diff)
downloadtcl-b7eeffcdef4802086b4f43db1619b2784d74aa79.zip
tcl-b7eeffcdef4802086b4f43db1619b2784d74aa79.tar.gz
tcl-b7eeffcdef4802086b4f43db1619b2784d74aa79.tar.bz2
Merge trunk
Diffstat (limited to 'generic/tclZipfs.c')
-rw-r--r--generic/tclZipfs.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 12f0ea0..b0bb383 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -217,9 +217,9 @@ typedef struct ZipEntry {
ZipFile *zipFilePtr; /* The ZIP file holding this virtual file */
size_t offset; /* Data offset into memory mapped ZIP file */
int numBytes; /* Uncompressed size of the virtual file.
- -1 for zip64 */
+ * -1 for zip64 */
int numCompressedBytes; /* Compressed size of the virtual file.
- -1 for zip64 */
+ * -1 for zip64 */
int compressMethod; /* Compress method */
int isDirectory; /* 0 if file, 1 if directory, -1 if root */
int depth; /* Number of slashes in path. */
@@ -810,11 +810,13 @@ IsCryptHeaderValid(
*------------------------------------------------------------------------
*/
static int
-DecodeCryptHeader(Tcl_Interp *interp,
- ZipEntry *z,
- unsigned long keys[3],/* Updated on success. Must have been
- initialized by caller. */
- unsigned char cryptHeader[ZIP_CRYPT_HDR_LEN]) /* From zip file content */
+DecodeCryptHeader(
+ Tcl_Interp *interp,
+ ZipEntry *z,
+ unsigned long keys[3], /* Updated on success. Must have been
+ * initialized by caller. */
+ unsigned char cryptHeader[ZIP_CRYPT_HDR_LEN])
+ /* From zip file content */
{
int i;
int ch;
@@ -1065,11 +1067,12 @@ errorReturn:
*------------------------------------------------------------------------
*/
static char *
-MapPathToZipfs(Tcl_Interp *interp,
- const char *mountPath, /* Must be fully normalized */
- const char *path, /* Archive content path to map */
- Tcl_DString *dsPtr) /* Must be initialized and cleared
- by caller */
+MapPathToZipfs(
+ Tcl_Interp *interp,
+ const char *mountPath, /* Must be fully normalized */
+ const char *path, /* Archive content path to map */
+ Tcl_DString *dsPtr) /* Must be initialized and cleared
+ * by caller */
{
const char *joiner[2];
char *joinedPath;