summaryrefslogtreecommitdiffstats
path: root/generic/tclZipfs.c
diff options
context:
space:
mode:
Diffstat (limited to 'generic/tclZipfs.c')
-rw-r--r--generic/tclZipfs.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index f284704..1653dbe 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -42,14 +42,14 @@
#define ZIPFS_ERROR(interp,errstr) \
do { \
if (interp) { \
- Tcl_SetObjResult(interp, Tcl_NewStringObj(errstr, -1)); \
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(errstr, TCL_INDEX_NONE)); \
} \
} while (0)
#define ZIPFS_MEM_ERROR(interp) \
do { \
if (interp) { \
Tcl_SetObjResult(interp, Tcl_NewStringObj( \
- "out of memory", -1)); \
+ "out of memory", TCL_INDEX_NONE)); \
Tcl_SetErrorCode(interp, "TCL", "MALLOC", NULL); \
} \
} while (0)
@@ -1708,8 +1708,8 @@ ZipFSCatalogFilesystem(
Tcl_DString ds2;
Tcl_DStringInit(&ds2);
- Tcl_DStringAppend(&ds2, "assets/.root/", -1);
- Tcl_DStringAppend(&ds2, path, -1);
+ Tcl_DStringAppend(&ds2, "assets/.root/", TCL_INDEX_NONE);
+ Tcl_DStringAppend(&ds2, path, TCL_INDEX_NONE);
if (ZipFSLookup(Tcl_DStringValue(&ds2))) {
/* should not happen but skip it anyway */
Tcl_DStringFree(&ds2);
@@ -1785,7 +1785,7 @@ ZipFSCatalogFilesystem(
Tcl_DStringSetLength(&ds, strlen(z->name) + 8);
Tcl_DStringSetLength(&ds, 0);
- Tcl_DStringAppend(&ds, z->name, -1);
+ Tcl_DStringAppend(&ds, z->name, TCL_INDEX_NONE);
dir = Tcl_DStringValue(&ds);
for (endPtr = strrchr(dir, '/'); endPtr && (endPtr != dir);
endPtr = strrchr(dir, '/')) {
@@ -1907,9 +1907,9 @@ ListMountPoints(
hPtr = Tcl_NextHashEntry(&search)) {
zf = (ZipFile *) Tcl_GetHashValue(hPtr);
Tcl_ListObjAppendElement(NULL, resultList, Tcl_NewStringObj(
- zf->mountPoint, -1));
+ zf->mountPoint, TCL_INDEX_NONE));
Tcl_ListObjAppendElement(NULL, resultList, Tcl_NewStringObj(
- zf->name, -1));
+ zf->name, TCL_INDEX_NONE));
}
Tcl_SetObjResult(interp, resultList);
return TCL_OK;
@@ -1943,7 +1943,7 @@ DescribeMounted(
ZipFile *zf = ZipFSLookupZip(mountPoint);
if (zf) {
- Tcl_SetObjResult(interp, Tcl_NewStringObj(zf->name, -1));
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(zf->name, TCL_INDEX_NONE));
return TCL_OK;
}
}
@@ -2237,7 +2237,7 @@ ZipFSMountObjCmd(
zipFileObj = Tcl_FSGetNormalizedPath(interp, objv[2]);
if (!zipFileObj) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
- "could not normalize zip filename", -1));
+ "could not normalize zip filename", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "NORMALIZE", NULL);
return TCL_ERROR;
}
@@ -2333,7 +2333,7 @@ ZipFSRootObjCmd(
TCL_UNUSED(int) /*objc*/,
TCL_UNUSED(Tcl_Obj *const *)) /*objv*/
{
- Tcl_SetObjResult(interp, Tcl_NewStringObj(ZIPFS_VOLUME, -1));
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(ZIPFS_VOLUME, TCL_INDEX_NONE));
return TCL_OK;
}
@@ -2451,7 +2451,7 @@ RandomChar(
double r;
Tcl_Obj *ret;
- if (Tcl_EvalEx(interp, "::tcl::mathfunc::rand", -1, 0) != TCL_OK) {
+ if (Tcl_EvalEx(interp, "::tcl::mathfunc::rand", TCL_INDEX_NONE, 0) != TCL_OK) {
goto failed;
}
ret = Tcl_GetObjResult(interp);
@@ -2540,7 +2540,7 @@ ZipAddFile(
* crazy enough to embed NULs in filenames, they deserve what they get!
*/
- zpathExt = Tcl_UtfToExternalDString(ZipFS.utf8, zpathTcl, -1, &zpathDs);
+ zpathExt = Tcl_UtfToExternalDString(ZipFS.utf8, zpathTcl, TCL_INDEX_NONE, &zpathDs);
zpathlen = strlen(zpathExt);
if (zpathlen + ZIP_CENTRAL_HEADER_LEN > bufsize) {
Tcl_SetObjResult(interp, Tcl_ObjPrintf(
@@ -2880,7 +2880,7 @@ ZipFSFind(
Tcl_Obj *cmd[2];
int result;
- cmd[0] = Tcl_NewStringObj("::tcl::zipfs::find", -1);
+ cmd[0] = Tcl_NewStringObj("::tcl::zipfs::find", TCL_INDEX_NONE);
cmd[1] = dirRoot;
Tcl_IncrRefCount(cmd[0]);
result = Tcl_EvalObjv(interp, 2, cmd, 0);
@@ -3208,7 +3208,7 @@ ZipFSMkZipOrImg(
}
z = (ZipEntry *) Tcl_GetHashValue(hPtr);
- name = Tcl_UtfToExternalDString(ZipFS.utf8, z->name, -1, &ds);
+ name = Tcl_UtfToExternalDString(ZipFS.utf8, z->name, TCL_INDEX_NONE, &ds);
len = Tcl_DStringLength(&ds);
SerializeCentralDirectoryEntry(start, end, (unsigned char *) buf,
z, len);
@@ -3628,7 +3628,7 @@ ZipFSCanonicalObjCmd(
filename = TclGetString(objv[2]);
result = CanonicalPath(mntpoint, filename, &dPath, zipfs);
}
- Tcl_SetObjResult(interp, Tcl_NewStringObj(result, -1));
+ Tcl_SetObjResult(interp, Tcl_NewStringObj(result, TCL_INDEX_NONE));
return TCL_OK;
}
@@ -3673,7 +3673,7 @@ ZipFSExistsObjCmd(
filename = TclGetString(objv[1]);
Tcl_DStringInit(&ds);
Tcl_DStringAppend(&ds, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN - 1);
- Tcl_DStringAppend(&ds, filename, -1);
+ Tcl_DStringAppend(&ds, filename, TCL_INDEX_NONE);
filename = Tcl_DStringValue(&ds);
ReadLock();
@@ -3724,7 +3724,7 @@ ZipFSInfoObjCmd(
Tcl_Obj *result = Tcl_GetObjResult(interp);
Tcl_ListObjAppendElement(interp, result,
- Tcl_NewStringObj(z->zipFilePtr->name, -1));
+ Tcl_NewStringObj(z->zipFilePtr->name, TCL_INDEX_NONE));
Tcl_ListObjAppendElement(interp, result,
Tcl_NewWideIntObj(z->numBytes));
Tcl_ListObjAppendElement(interp, result,
@@ -3810,7 +3810,7 @@ ZipFSListObjCmd(
if (Tcl_StringMatch(z->name, pattern)) {
Tcl_ListObjAppendElement(interp, result,
- Tcl_NewStringObj(z->name, -1));
+ Tcl_NewStringObj(z->name, TCL_INDEX_NONE));
}
}
} else if (regexp) {
@@ -3820,7 +3820,7 @@ ZipFSListObjCmd(
if (Tcl_RegExpExec(interp, regexp, z->name, z->name)) {
Tcl_ListObjAppendElement(interp, result,
- Tcl_NewStringObj(z->name, -1));
+ Tcl_NewStringObj(z->name, TCL_INDEX_NONE));
}
}
} else {
@@ -3829,7 +3829,7 @@ ZipFSListObjCmd(
ZipEntry *z = (ZipEntry *) Tcl_GetHashValue(hPtr);
Tcl_ListObjAppendElement(interp, result,
- Tcl_NewStringObj(z->name, -1));
+ Tcl_NewStringObj(z->name, TCL_INDEX_NONE));
}
}
Unlock();
@@ -3873,7 +3873,7 @@ TclZipfs_TclLibrary(void)
*/
if (zipfs_literal_tcl_library) {
- return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+ return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
}
/*
@@ -3887,7 +3887,7 @@ TclZipfs_TclLibrary(void)
Tcl_DecrRefCount(vfsInitScript);
if (found == TCL_OK) {
zipfs_literal_tcl_library = ZIPFS_APP_MOUNT "/tcl_library";
- return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+ return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
}
/*
@@ -3906,17 +3906,17 @@ TclZipfs_TclLibrary(void)
#endif
if (ZipfsAppHookFindTclInit(dllName) == TCL_OK) {
- return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+ return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
}
#elif !defined(NO_DLFCN_H)
Dl_info dlinfo;
if (dladdr((const void *)TclZipfs_TclLibrary, &dlinfo) && (dlinfo.dli_fname != NULL)
&& (ZipfsAppHookFindTclInit(dlinfo.dli_fname) == TCL_OK)) {
- return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+ return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
}
#else
if (ZipfsAppHookFindTclInit(CFG_RUNTIME_LIBDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
- return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+ return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
}
#endif /* _WIN32 */
#endif /* !defined(STATIC_BUILD) */
@@ -3927,7 +3927,7 @@ TclZipfs_TclLibrary(void)
*/
if (zipfs_literal_tcl_library) {
- return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
+ return Tcl_NewStringObj(zipfs_literal_tcl_library, TCL_INDEX_NONE);
}
return NULL;
}
@@ -4936,7 +4936,7 @@ static Tcl_Obj *
ZipFSFilesystemSeparatorProc(
TCL_UNUSED(Tcl_Obj *) /*pathPtr*/)
{
- return Tcl_NewStringObj("/", -1);
+ return Tcl_NewStringObj("/", TCL_INDEX_NONE);
}
/*
@@ -4956,11 +4956,11 @@ AppendWithPrefix(
Tcl_DString *prefix, /* The prefix to add to the element, or NULL
* for don't do that. */
const char *name, /* The name to append. */
- int nameLen) /* The length of the name. May be -1 for
+ size_t nameLen) /* The length of the name. May be TCL_INDEX_NONE for
* append-up-to-NUL-byte. */
{
if (prefix) {
- int prefixLength = Tcl_DStringLength(prefix);
+ size_t prefixLength = Tcl_DStringLength(prefix);
Tcl_DStringAppend(prefix, name, nameLen);
Tcl_ListObjAppendElement(NULL, result, Tcl_NewStringObj(
@@ -5063,7 +5063,7 @@ ZipFSMatchInDirectoryProc(
if (z && ((dirOnly < 0) || (!dirOnly && !z->isDirectory)
|| (dirOnly && z->isDirectory))) {
- AppendWithPrefix(result, prefixBuf, z->name, -1);
+ AppendWithPrefix(result, prefixBuf, z->name, TCL_INDEX_NONE);
}
goto end;
}
@@ -5096,7 +5096,7 @@ ZipFSMatchInDirectoryProc(
continue;
}
if ((z->depth == scnt) && Tcl_StringCaseMatch(z->name, pat, 0)) {
- AppendWithPrefix(result, prefixBuf, z->name + strip, -1);
+ AppendWithPrefix(result, prefixBuf, z->name + strip, TCL_INDEX_NONE);
}
}
Tcl_Free(pat);
@@ -5286,7 +5286,7 @@ ZipFSPathInFilesystemProc(
static Tcl_Obj *
ZipFSListVolumesProc(void)
{
- return Tcl_NewStringObj(ZIPFS_VOLUME, -1);
+ return Tcl_NewStringObj(ZIPFS_VOLUME, TCL_INDEX_NONE);
}
/*
@@ -5400,10 +5400,10 @@ ZipFSFileAttrsGetProc(
z->zipFilePtr->mountPointLen);
break;
case ZIP_ATTR_ARCHIVE:
- *objPtrRef = Tcl_NewStringObj(z->zipFilePtr->name, -1);
+ *objPtrRef = Tcl_NewStringObj(z->zipFilePtr->name, TCL_INDEX_NONE);
break;
case ZIP_ATTR_PERMISSIONS:
- *objPtrRef = Tcl_NewStringObj("0o555", -1);
+ *objPtrRef = Tcl_NewStringObj("0o555", TCL_INDEX_NONE);
break;
case ZIP_ATTR_CRC:
TclNewIntObj(*objPtrRef, z->crc32);
@@ -5464,7 +5464,7 @@ static Tcl_Obj *
ZipFSFilesystemPathTypeProc(
TCL_UNUSED(Tcl_Obj *) /*pathPtr*/)
{
- return Tcl_NewStringObj("zip", -1);
+ return Tcl_NewStringObj("zip", TCL_INDEX_NONE);
}
/*
@@ -5661,7 +5661,7 @@ TclZipfs_Init(
Tcl_Command ensemble;
Tcl_Obj *mapObj;
- Tcl_EvalEx(interp, findproc, -1, TCL_EVAL_GLOBAL);
+ Tcl_EvalEx(interp, findproc, TCL_INDEX_NONE, TCL_EVAL_GLOBAL);
if (!Tcl_IsSafe(interp)) {
Tcl_LinkVar(interp, "::tcl::zipfs::wrmax", (char *) &ZipFS.wrmax,
TCL_LINK_INT);
@@ -5676,8 +5676,8 @@ TclZipfs_Init(
*/
Tcl_GetEnsembleMappingDict(NULL, ensemble, &mapObj);
- Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj("find", -1),
- Tcl_NewStringObj("::tcl::zipfs::find", -1));
+ Tcl_DictObjPut(NULL, mapObj, Tcl_NewStringObj("find", TCL_INDEX_NONE),
+ Tcl_NewStringObj("::tcl::zipfs::find", TCL_INDEX_NONE));
Tcl_CreateObjCommand(interp, "::tcl::zipfs::tcl_library_init",
ZipFSTclLibraryObjCmd, NULL, NULL);
Tcl_PkgProvide(interp, "tcl::zipfs", "2.0");
@@ -5859,7 +5859,7 @@ TclZipfs_AppHook(
Tcl_DString ds;
Tcl_DStringInit(&ds);
- archive = Tcl_WCharToUtfDString((*argvPtr)[1], -1, &ds);
+ archive = Tcl_WCharToUtfDString((*argvPtr)[1], TCL_INDEX_NONE, &ds);
#else /* !_WIN32 */
archive = (*argvPtr)[1];
#endif /* _WIN32 */
generated by cgit v0.12 at 2024-10-21 20:58:23 (GMT)