Remove casts from uses of ckalloc/ckfree/... now that Tcl declares them to be

using useful casts internally.

1 files changed, 33 insertions, 41 deletions

diff --git a/generic/tkCanvLine.c b/generic/tkCanvLine.c
index 34cdfae..9be9bf6 100644
--- a/generic/tkCanvLine.c
+++ b/generic/tkCanvLine.c
@@ -408,10 +408,9 @@ LineCoords(
     } else {
 	numPoints = objc/2;
 	if (linePtr->numPoints != numPoints) {
-	    coordPtr = (double *)
-		    ckalloc(sizeof(double) * (unsigned) objc);
+	    coordPtr = ckalloc(sizeof(double) * objc);
 	    if (linePtr->coordPtr != NULL) {
-		ckfree((char *) linePtr->coordPtr);
+		ckfree(linePtr->coordPtr);
 	    }
 	    linePtr->coordPtr = coordPtr;
 	    linePtr->numPoints = numPoints;
@@ -430,11 +429,11 @@ LineCoords(
 	 */
 
 	if (linePtr->firstArrowPtr != NULL) {
-	    ckfree((char *) linePtr->firstArrowPtr);
+	    ckfree(linePtr->firstArrowPtr);
 	    linePtr->firstArrowPtr = NULL;
 	}
 	if (linePtr->lastArrowPtr != NULL) {
-	    ckfree((char *) linePtr->lastArrowPtr);
+	    ckfree(linePtr->lastArrowPtr);
 	    linePtr->lastArrowPtr = NULL;
 	}
 	if (linePtr->arrow != ARROWS_NONE) {
@@ -561,7 +560,7 @@ ConfigureLine(
 	    && (linePtr->arrow != ARROWS_BOTH)) {
 	linePtr->coordPtr[0] = linePtr->firstArrowPtr[0];
 	linePtr->coordPtr[1] = linePtr->firstArrowPtr[1];
-	ckfree((char *) linePtr->firstArrowPtr);
+	ckfree(linePtr->firstArrowPtr);
 	linePtr->firstArrowPtr = NULL;
     }
     if ((linePtr->lastArrowPtr != NULL) && (linePtr->arrow != ARROWS_LAST)
@@ -571,7 +570,7 @@ ConfigureLine(
 	i = 2*(linePtr->numPoints-1);
 	linePtr->coordPtr[i] = linePtr->lastArrowPtr[0];
 	linePtr->coordPtr[i+1] = linePtr->lastArrowPtr[1];
-	ckfree((char *) linePtr->lastArrowPtr);
+	ckfree(linePtr->lastArrowPtr);
 	linePtr->lastArrowPtr = NULL;
     }
     if (linePtr->arrow != ARROWS_NONE) {
@@ -614,16 +613,16 @@ DeleteLine(
 
     Tk_DeleteOutline(display, &linePtr->outline);
     if (linePtr->coordPtr != NULL) {
-	ckfree((char *) linePtr->coordPtr);
+	ckfree(linePtr->coordPtr);
     }
     if (linePtr->arrowGC != None) {
 	Tk_FreeGC(display, linePtr->arrowGC);
     }
     if (linePtr->firstArrowPtr != NULL) {
-	ckfree((char *) linePtr->firstArrowPtr);
+	ckfree(linePtr->firstArrowPtr);
     }
     if (linePtr->lastArrowPtr != NULL) {
-	ckfree((char *) linePtr->lastArrowPtr);
+	ckfree(linePtr->lastArrowPtr);
     }
 }
 
@@ -879,8 +878,7 @@ DisplayLine(
     if (numPoints <= MAX_STATIC_POINTS) {
 	pointPtr = staticPoints;
     } else {
-	pointPtr = (XPoint *)
-		ckalloc((unsigned) numPoints * 3 * sizeof(XPoint));
+	pointPtr = ckalloc(numPoints * 3 * sizeof(XPoint));
     }
 
     if ((linePtr->smooth) && (linePtr->numPoints > 2)) {
@@ -916,7 +914,7 @@ DisplayLine(
 		(unsigned) intwidth+1, (unsigned) intwidth+1, 0, 64*360);
     }
     if (pointPtr != staticPoints) {
-	ckfree((char *) pointPtr);
+	ckfree(pointPtr);
     }
 
     /*
@@ -989,8 +987,7 @@ LineInsert(
 	linePtr->coordPtr[length-2] = linePtr->lastArrowPtr[0];
 	linePtr->coordPtr[length-1] = linePtr->lastArrowPtr[1];
     }
-    newCoordPtr = (double *)
-	    ckalloc(sizeof(double) * (unsigned)(length + objc));
+    newCoordPtr = ckalloc(sizeof(double) * (length + objc));
     for (i=0; i<beforeThis; i++) {
 	newCoordPtr[i] = linePtr->coordPtr[i];
     }
@@ -998,7 +995,7 @@ LineInsert(
 	if (Tcl_GetDoubleFromObj(NULL, objv[i],
 		&newCoordPtr[i + beforeThis]) != TCL_OK) {
 	    Tcl_ResetResult(Canvas(canvas)->interp);
-	    ckfree((char *) newCoordPtr);
+	    ckfree(newCoordPtr);
 	    return;
 	}
     }
@@ -1007,7 +1004,7 @@ LineInsert(
 	newCoordPtr[i+objc] = linePtr->coordPtr[i];
     }
     if (linePtr->coordPtr) {
-        ckfree((char *) linePtr->coordPtr);
+        ckfree(linePtr->coordPtr);
     }
     linePtr->coordPtr = newCoordPtr;
     length += objc ;
@@ -1070,11 +1067,11 @@ LineInsert(
 	}
     }
     if (linePtr->firstArrowPtr != NULL) {
-	ckfree((char *) linePtr->firstArrowPtr);
+	ckfree(linePtr->firstArrowPtr);
 	linePtr->firstArrowPtr = NULL;
     }
     if (linePtr->lastArrowPtr != NULL) {
-	ckfree((char *) linePtr->lastArrowPtr);
+	ckfree(linePtr->lastArrowPtr);
 	linePtr->lastArrowPtr = NULL;
     }
     if (linePtr->arrow != ARROWS_NONE) {
@@ -1247,11 +1244,11 @@ LineDeleteCoords(
     }
     linePtr->numPoints -= count/2;
     if (linePtr->firstArrowPtr != NULL) {
-	ckfree((char *) linePtr->firstArrowPtr);
+	ckfree(linePtr->firstArrowPtr);
 	linePtr->firstArrowPtr = NULL;
     }
     if (linePtr->lastArrowPtr != NULL) {
-	ckfree((char *) linePtr->lastArrowPtr);
+	ckfree(linePtr->lastArrowPtr);
 	linePtr->lastArrowPtr = NULL;
     }
     if (linePtr->arrow != ARROWS_NONE) {
@@ -1371,8 +1368,7 @@ LineToPoint(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    linePoints = staticSpace;
 	} else {
-	    linePoints = (double *)
-		    ckalloc((unsigned) (2*numPoints*sizeof(double)));
+	    linePoints = ckalloc(2 * numPoints * sizeof(double));
 	}
 	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
 		linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);
@@ -1531,7 +1527,7 @@ LineToPoint(
 
   done:
     if ((linePoints != staticSpace) && (linePoints != linePtr->coordPtr)) {
-	ckfree((char *) linePoints);
+	ckfree(linePoints);
     }
     return bestDist;
 }
@@ -1607,8 +1603,7 @@ LineToArea(
 	if (numPoints <= MAX_STATIC_POINTS) {
 	    linePoints = staticSpace;
 	} else {
-	    linePoints = (double *)
-		    ckalloc((unsigned) (2*numPoints*sizeof(double)));
+	    linePoints = ckalloc(2 * numPoints * sizeof(double));
 	}
 	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
 		linePtr->numPoints, linePtr->splineSteps, NULL, linePoints);
@@ -1654,7 +1649,7 @@ LineToArea(
 
   done:
     if ((linePoints != staticSpace) && (linePoints != linePtr->coordPtr)) {
-	ckfree((char *) linePoints);
+	ckfree(linePoints);
     }
     return result;
 }
@@ -1699,7 +1694,7 @@ ScaleLine(
     if (linePtr->firstArrowPtr != NULL) {
 	linePtr->coordPtr[0] = linePtr->firstArrowPtr[0];
 	linePtr->coordPtr[1] = linePtr->firstArrowPtr[1];
-	ckfree((char *) linePtr->firstArrowPtr);
+	ckfree(linePtr->firstArrowPtr);
 	linePtr->firstArrowPtr = NULL;
     }
     if (linePtr->lastArrowPtr != NULL) {
@@ -1708,7 +1703,7 @@ ScaleLine(
 	i = 2*(linePtr->numPoints-1);
 	linePtr->coordPtr[i] = linePtr->lastArrowPtr[0];
 	linePtr->coordPtr[i+1] = linePtr->lastArrowPtr[1];
-	ckfree((char *) linePtr->lastArrowPtr);
+	ckfree(linePtr->lastArrowPtr);
 	linePtr->lastArrowPtr = NULL;
     }
     for (i = 0, coordPtr = linePtr->coordPtr; i < linePtr->numPoints;
@@ -1906,7 +1901,7 @@ ParseArrowShape(
 	Tcl_AppendResult(interp, "bad arrow shape \"", value,
 		"\": must be list with three numbers", NULL);
 	if (argv != NULL) {
-	    ckfree((char *) argv);
+	    ckfree(argv);
 	}
 	return TCL_ERROR;
     }
@@ -1920,10 +1915,10 @@ ParseArrowShape(
 		!= TCL_OK)) {
 	goto syntaxError;
     }
-    linePtr->arrowShapeA = (float)a;
-    linePtr->arrowShapeB = (float)b;
-    linePtr->arrowShapeC = (float)c;
-    ckfree((char *) argv);
+    linePtr->arrowShapeA = (float) a;
+    linePtr->arrowShapeB = (float) b;
+    linePtr->arrowShapeC = (float) c;
+    ckfree(argv);
     return TCL_OK;
 }
 
@@ -2153,8 +2148,7 @@ ConfigureArrows(
     if (linePtr->arrow != ARROWS_LAST) {
 	poly = linePtr->firstArrowPtr;
 	if (poly == NULL) {
-	    poly = (double *)
-		    ckalloc((unsigned) (2*PTS_IN_ARROW*sizeof(double)));
+	    poly = ckalloc(2 * PTS_IN_ARROW * sizeof(double));
 	    poly[0] = poly[10] = linePtr->coordPtr[0];
 	    poly[1] = poly[11] = linePtr->coordPtr[1];
 	    linePtr->firstArrowPtr = poly;
@@ -2198,8 +2192,7 @@ ConfigureArrows(
 	coordPtr = linePtr->coordPtr + 2*(linePtr->numPoints-2);
 	poly = linePtr->lastArrowPtr;
 	if (poly == NULL) {
-	    poly = (double *)
-		    ckalloc((unsigned) (2*PTS_IN_ARROW*sizeof(double)));
+	    poly = ckalloc(2 * PTS_IN_ARROW * sizeof(double));
 	    poly[0] = poly[10] = coordPtr[2];
 	    poly[1] = poly[11] = coordPtr[3];
 	    linePtr->lastArrowPtr = poly;
@@ -2348,14 +2341,13 @@ LineToPostscript(
 		linePtr->numPoints, linePtr->splineSteps, NULL, NULL);
 	pointPtr = staticPoints;
 	if (numPoints > MAX_STATIC_POINTS) {
-	    pointPtr = (double *)
-		    ckalloc((unsigned) (numPoints * 2 * sizeof(double)));
+	    pointPtr = ckalloc(numPoints * 2 * sizeof(double));
 	}
 	numPoints = linePtr->smooth->coordProc(canvas, linePtr->coordPtr,
 		linePtr->numPoints, linePtr->splineSteps, NULL, pointPtr);
 	Tk_CanvasPsPath(interp, canvas, pointPtr, numPoints);
 	if (pointPtr != staticPoints) {
-	    ckfree((char *) pointPtr);
+	    ckfree(pointPtr);
 	}
     }