@@ -3,11 +3,11 @@
  * some modifications:
  *	Copyright (C) 2000 Ajuba Solutions
  *	Copyright (C) 2002 ActiveState Corporation
  *	Copyright (C) 2004 Starfish Systems 
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.21 2004/03/19 21:05:16 hobbs Exp $
+ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.22 2004/03/24 05:22:53 razzell Exp $
  *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built (almost) from scratch based upon observation of
@@ -397,11 +397,11 @@
     int result;
 
     if (statePtr->password == NULL) {
 	if (Tcl_Eval(interp, "tls::password") == TCL_OK) {
 	    char *ret = (char *) Tcl_GetStringResult(interp);
-	    strncpy(buf, ret, size);
+	    strncpy(buf, ret, (size_t) size);
 	    return strlen(ret);
 	} else {
 	    return -1;
 	}
     }
@@ -421,11 +421,11 @@
     Tcl_Release((ClientData) statePtr);
     Tcl_Release((ClientData) statePtr->interp);
 
     if (result == TCL_OK) {
 	char *ret = (char *) Tcl_GetStringResult(interp);
-	strncpy(buf, ret, size);
+	strncpy(buf, ret, (size_t) size);
 	return strlen(ret);
     } else {
 	return -1;
     }
 }
@@ -499,10 +499,12 @@
 		Tcl_AppendResult(interp, "protocol not supported", NULL);
 		return TCL_ERROR;
 #else
 		ctx = SSL_CTX_new(TLSv1_method()); break;
 #endif
+    default:
+		break;
     }
     if (ctx == NULL) {
 	Tcl_AppendResult(interp, REASON(), (char *) NULL);
 	return TCL_ERROR;
     }
@@ -1299,10 +1301,12 @@
 	    } else {
 		Tcl_SetResult(interp,"Error generating private key",NULL);
 		return TCL_ERROR;
 	    }
 	}
+	break;
+    default:
 	break;
     }
     return TCL_OK;
 }