Merge 9.0

9 files changed, 11 insertions, 14 deletions

diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index 579c323..aacb9cd 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -40,7 +40,7 @@ Pkga_EqObjCmd(
 {
     int result;
     const char *str1, *str2;
-    int len1, len2;
+    Tcl_Size len1, len2;
     (void)dummy;
 
     if (objc != 3) {
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index 651c132..750d270 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -84,7 +84,7 @@ Pkgb_UnsafeObjCmd(
     (void)objc;
     (void)objv;
 
-    return Tcl_EvalEx(interp, "list unsafe command invoked", -1, TCL_EVAL_GLOBAL);
+    return Tcl_EvalEx(interp, "list unsafe command invoked", TCL_INDEX_NONE, TCL_EVAL_GLOBAL);
 }
 
 static int
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
index 8e9c829..582d457 100644
--- a/unix/dltest/pkgc.c
+++ b/unix/dltest/pkgc.c
@@ -81,7 +81,7 @@ Pkgc_UnsafeObjCmd(
     (void)objc;
     (void)objv;
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", TCL_INDEX_NONE));
     return TCL_OK;
 }
 
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index 1b97d4c..52ba968 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -81,7 +81,7 @@ Pkgd_UnsafeObjCmd(
     (void)objc;
     (void)objv;
 
-    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
+    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", TCL_INDEX_NONE));
     return TCL_OK;
 }
 
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index 26a4b79..5f0db9b 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -41,5 +41,5 @@ Pkge_Init(
     if (Tcl_InitStubs(interp, "8.5-", 0) == NULL) {
 	return TCL_ERROR;
     }
-    return Tcl_EvalEx(interp, script, -1, 0);
+    return Tcl_EvalEx(interp, script, TCL_INDEX_NONE, 0);
 }
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index 16684a8..b14fca8 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -127,7 +127,7 @@ PkguaEqObjCmd(
 {
     int result;
     const char *str1, *str2;
-    int len1, len2;
+    Tcl_Size len1, len2;
     (void)dummy;
 
     if (objc != 3) {
diff --git a/unix/dltest/pkgπ.c b/unix/dltest/pkgπ.c
index dc01fbd..58b36db 100644
--- a/unix/dltest/pkgπ.c
+++ b/unix/dltest/pkgπ.c
@@ -38,9 +38,6 @@ Pkg\u03C0_\u03A0ObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int result;
-    const char *str1, *str2;
-    int len1, len2;
     (void)dummy;
 
     if (objc != 1) {
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 7753cec..b8911df 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -1648,7 +1648,7 @@ SetPermissionsAttribute(
 	Tcl_Obj *modeObj;
 
 	TclNewLiteralStringObj(modeObj, "0o");
-	Tcl_AppendToObj(modeObj, modeStringPtr+scanned+1, -1);
+	Tcl_AppendToObj(modeObj, modeStringPtr+scanned+1, TCL_INDEX_NONE);
 	result = Tcl_GetWideIntFromObj(NULL, modeObj, &mode);
 	Tcl_DecrRefCount(modeObj);
     }
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 864d477..c16b081 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1030,10 +1030,10 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'k') &&
 	    (strncmp(optionName, "-keepalive", len) == 0))) {
+	int opt = 0;
 #if defined(SO_KEEPALIVE)
-	socklen_t size;
+	socklen_t size = sizeof(opt);
 #endif
-	int opt = 0;
 
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-keepalive");
@@ -1050,10 +1050,10 @@ TcpGetOptionProc(
 
     if ((len == 0) || ((len > 1) && (optionName[1] == 'n') &&
 	    (strncmp(optionName, "-nodelay", len) == 0))) {
+	int opt = 0;
 #if defined(SOL_TCP) && defined(TCP_NODELAY)
-	socklen_t size;
+	socklen_t size = sizeof(opt);
 #endif
-	int opt = 0;
 
 	if (len == 0) {
 	    Tcl_DStringAppendElement(dsPtr, "-nodelay");