From f6bb864fc7610c6c893acee7b4a7604a287e6018 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 18 Jan 2016 09:28:55 +0000
Subject: Minor tweaks in documentation/testcases. Don't use deprecated Tcl
 methods any more

---
 doc/zipfs.n      |  4 ++--
 generic/zipfs.c  | 10 +++++-----
 tests/zipfs.test |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/zipfs.n b/doc/zipfs.n
index b21ad57..d16c047 100644
--- a/doc/zipfs.n
+++ b/doc/zipfs.n
@@ -22,7 +22,7 @@ zipfs \- Mount and work with ZIP files within Tcl
 \fB::zipfs::mkimg\fR \fIoutfile\fR \fIindir\fR \fI?strip?\fR \fI?password?\fR \fI?infile?\fR
 \fB::zipfs::mkkey\fR \fIpassword\fR
 \fB::zipfs::mkzip\fR \fIoutfile\fR \fIindir\fR \fI?strip?\fR \fI?password?\fR
-\fB::zipfs::mount\fR \fI?zipfile\fR \fI?mountpoint?\fR \fI?password?\fR
+\fB::zipfs::mount\fR \fI?zipfile?\fR \fI?mountpoint?\fR \fI?password?\fR
 \fB::zipfs::unmount\fR \fIzipfile\fR
 .fi
 .BE
@@ -94,7 +94,7 @@ Caution: the choice of the \fIindir\fR parameter
 archive's content. 
 .RE
 .TP
-\fB::zipfs::mount ?\fIzipfile\fR? ?\fImountpoint\fR?
+\fB::zipfs::mount ?\fIzipfile\fR? ?\fImountpoint\fR? ?\fIpassword\fR?
 .
 The \fB::zipfs::mount\fR command mounts a ZIP archive file as a VFS.
 After this command executes, files contained in \fIzipfile\fR
diff --git a/generic/zipfs.c b/generic/zipfs.c
index 55c6d2c..e789e14 100644
--- a/generic/zipfs.c
+++ b/generic/zipfs.c
@@ -1507,7 +1507,7 @@ ZipFSMountObjCmd(ClientData clientData, Tcl_Interp *interp,
 {
     if (objc > 4) {
 	Tcl_WrongNumArgs(interp, 1, objv,
-			 "?zipfile mountpoint password?");
+			 "?zipfile? ?mountpoint? ?password?");
 	return TCL_ERROR;
     }
     return Tclzipfs_Mount(interp, (objc > 1) ? Tcl_GetString(objv[1]) : NULL,
@@ -1729,7 +1729,7 @@ wrerr:
 
 	init_keys(passwd, keys, crc32tab);
 	for (i = 0; i < 12 - 2; i++) {
-	    if (Tcl_Eval(interp, "expr int(rand() * 256) % 256") != TCL_OK) {
+	    if (Tcl_EvalEx(interp, "expr int(rand() * 256) % 256", -1, 0) != TCL_OK) {
 		Tcl_AppendResult(interp, "PRNG error", (char *) NULL);
 		Tcl_Close(interp, in);
 		return TCL_ERROR;
@@ -1966,8 +1966,8 @@ ZipFSMkZipOrImgObjCmd(ClientData clientData, Tcl_Interp *interp,
     } else {
 	if ((objc < 3) || (objc > (isImg ? 6 : 5))) {
 	    Tcl_WrongNumArgs(interp, 1, objv, isImg ?
-			     "outfile indir ?strip password infile?" :
-			     "outfile indir ?strip password?");
+			     "outfile indir ?strip? ?password? ?infile?" :
+			     "outfile indir ?strip? ?password?");
 	    return TCL_ERROR;
 	}
     }
@@ -4009,7 +4009,7 @@ Zipfs_doInit(Tcl_Interp *interp, int safe)
 			     ZipFSLMkImgObjCmd, 0, 0);
 	Tcl_CreateObjCommand(interp, "::zipfs::lmkzip",
 			     ZipFSLMkZipObjCmd, 0, 0);
-	Tcl_GlobalEval(interp, findproc);
+	Tcl_EvalEx(interp, findproc, -1, TCL_EVAL_GLOBAL);
     }
     Tcl_CreateObjCommand(interp, "::zipfs::exists", ZipFSExistsObjCmd, 0, 0);
     Tcl_CreateObjCommand(interp, "::zipfs::info", ZipFSInfoObjCmd, 0, 0);
diff --git a/tests/zipfs.test b/tests/zipfs.test
index 3f53cf8..189461a 100644
--- a/tests/zipfs.test
+++ b/tests/zipfs.test
@@ -27,7 +27,7 @@ test zipfs-1.2 {zipfs basics} -constraints zipfs -body {
 
 test zipfs-1.3 {zipfs basics} -constraints zipfs -returnCodes error -body {
     ::zipfs::mount a b c d e f
-} -result {wrong # args: should be "::zipfs::mount ?zipfile ?mountpoint? ?password???"}
+} -result {wrong # args: should be "::zipfs::mount ?zipfile? ?mountpoint? ?password?"}
 
 test zipfs-1.4 {zipfs basics} -constraints zipfs -returnCodes error -body {
     ::zipfs::unmount a b c d e f
-- 
cgit v0.12