Fix encoding handling (check for TCL_IO_FAILURE was wrong). Eliminate (size_t) type casts and use of ckalloc() -> Tcl_Alloc()

2 files changed, 7 insertions, 8 deletions

diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index 9fda613..3b3bfa9 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -1677,7 +1677,7 @@ LoadTableEncoding(
     };
 
     Tcl_DStringInit(&lineString);
-    if (Tcl_Gets(chan, &lineString) != TCL_IO_FAILURE) {
+    if (Tcl_Gets(chan, &lineString) == TCL_IO_FAILURE) {
 	return NULL;
     }
     line = Tcl_DStringValue(&lineString);
@@ -2105,7 +2105,7 @@ BinaryProc(
     *srcReadPtr = srcLen;
     *dstWrotePtr = srcLen;
     *dstCharsPtr = srcLen;
-    memcpy(dst, src, (size_t) srcLen);
+    memcpy(dst, src, srcLen);
     return result;
 }
 
@@ -3302,7 +3302,7 @@ EscapeFromUtfProc(
 	    *dstWrotePtr = 0;
 	    return TCL_CONVERT_NOSPACE;
 	}
-	memcpy(dst, dataPtr->init, (size_t)dataPtr->initLen);
+	memcpy(dst, dataPtr->init, dataPtr->initLen);
 	dst += dataPtr->initLen;
     } else {
 	state = PTR2INT(*statePtr);
@@ -3380,8 +3380,7 @@ EscapeFromUtfProc(
 		    result = TCL_CONVERT_NOSPACE;
 		    break;
 		}
-		memcpy(dst, subTablePtr->sequence,
-			(size_t) subTablePtr->sequenceLen);
+		memcpy(dst, subTablePtr->sequence, subTablePtr->sequenceLen);
 		dst += subTablePtr->sequenceLen;
 	    }
 	}
@@ -3424,7 +3423,7 @@ EscapeFromUtfProc(
 		memcpy(dst, dataPtr->subTables[0].sequence, len);
 		dst += len;
 	    }
-	    memcpy(dst, dataPtr->final, (size_t) dataPtr->finalLen);
+	    memcpy(dst, dataPtr->final, dataPtr->finalLen);
 	    dst += dataPtr->finalLen;
 	    state &= ~TCL_ENCODING_END;
 	}
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 5db07a5..23ef1ba 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -283,11 +283,11 @@ InitializeHostName(
     *encodingPtr = Tcl_GetEncoding(NULL, NULL);
     if (native) {
 	*lengthPtr = strlen(native);
-	*valuePtr = ckalloc(*lengthPtr + 1);
+	*valuePtr = Tcl_Alloc(*lengthPtr + 1);
 	memcpy(*valuePtr, native, *lengthPtr + 1);
     } else {
 	*lengthPtr = 0;
-	*valuePtr = ckalloc(1);
+	*valuePtr = Tcl_Alloc(1);
 	*valuePtr[0] = '\0';
     }
 }