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

using useful casts internally.

1 files changed, 29 insertions, 30 deletions

diff --git a/win/tkWinImage.c b/win/tkWinImage.c
index 97ce065..01b5976 100644
--- a/win/tkWinImage.c
+++ b/win/tkWinImage.c
@@ -41,9 +41,9 @@ DestroyImage(
 {
     if (imagePtr) {
 	if (imagePtr->data) {
-	    ckfree((char*)imagePtr->data);
+	    ckfree(imagePtr->data);
 	}
-	ckfree((char*)imagePtr);
+	ckfree(imagePtr);
     }
     return 0;
 }
@@ -213,7 +213,7 @@ XCreateImage(
     int bitmap_pad,
     int bytes_per_line)
 {
-    XImage* imagePtr = (XImage *) ckalloc(sizeof(XImage));
+    XImage* imagePtr = ckalloc(sizeof(XImage));
     imagePtr->width = width;
     imagePtr->height = height;
     imagePtr->xoffset = offset;
@@ -351,7 +351,7 @@ XGetImageZPixmap(
     if (depth <= 8) {
 	size += sizeof(unsigned short) * (1 << depth);
     }
-    bmInfo = (BITMAPINFO *) ckalloc((unsigned)size);
+    bmInfo = ckalloc(size);
 
     bmInfo->bmiHeader.biSize		= sizeof(BITMAPINFOHEADER);
     bmInfo->bmiHeader.biWidth		= width;
@@ -369,7 +369,7 @@ XGetImageZPixmap(
 	unsigned char *p, *pend;
 
 	GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_PAL_COLORS);
-	data = (unsigned char *) ckalloc(bmInfo->bmiHeader.biSizeImage);
+	data = ckalloc(bmInfo->bmiHeader.biSizeImage);
 	if (!data) {
 	    /* printf("Failed to allocate data area for XImage.\n"); */
 	    ret_image = NULL;
@@ -378,7 +378,7 @@ XGetImageZPixmap(
 	ret_image = XCreateImage(display, NULL, depth, ZPixmap, 0, (char *) data,
 		width, height, 32, (int) ((width + 31) >> 3) & ~1);
 	if (ret_image == NULL) {
-	    ckfree((char *) data);
+	    ckfree(data);
 	    goto cleanup;
 	}
 
@@ -388,8 +388,8 @@ XGetImageZPixmap(
 
 	if (GetDIBits(hdcMem, hbmp, 0, height, data, bmInfo,
 		DIB_PAL_COLORS) == 0) {
-	    ckfree((char *) ret_image->data);
-	    ckfree((char *) ret_image);
+	    ckfree(ret_image->data);
+	    ckfree(ret_image);
 	    ret_image = NULL;
 	    goto cleanup;
 	}
@@ -405,7 +405,7 @@ XGetImageZPixmap(
 	unsigned char *p;
 
 	GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_PAL_COLORS);
-	data = (unsigned char *) ckalloc(bmInfo->bmiHeader.biSizeImage);
+	data = ckalloc(bmInfo->bmiHeader.biSizeImage);
 	if (!data) {
 	    /* printf("Failed to allocate data area for XImage.\n"); */
 	    ret_image = NULL;
@@ -414,7 +414,7 @@ XGetImageZPixmap(
 	ret_image = XCreateImage(display, NULL, 8, ZPixmap, 0, (char *) data,
 		width, height, 8, (int) width);
 	if (ret_image == NULL) {
-	    ckfree((char *) data);
+	    ckfree(data);
 	    goto cleanup;
 	}
 
@@ -424,8 +424,8 @@ XGetImageZPixmap(
 
 	if (GetDIBits(hdcMem, hbmp, 0, height, data, bmInfo,
 		DIB_PAL_COLORS) == 0) {
-	    ckfree((char *) ret_image->data);
-	    ckfree((char *) ret_image);
+	    ckfree(ret_image->data);
+	    ckfree(ret_image);
 	    ret_image = NULL;
 	    goto cleanup;
 	}
@@ -436,7 +436,7 @@ XGetImageZPixmap(
 	}
     } else if (depth == 16) {
 	GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_RGB_COLORS);
-	data = (unsigned char *) ckalloc(bmInfo->bmiHeader.biSizeImage);
+	data = ckalloc(bmInfo->bmiHeader.biSizeImage);
 	if (!data) {
 	    /* printf("Failed to allocate data area for XImage.\n"); */
 	    ret_image = NULL;
@@ -445,7 +445,7 @@ XGetImageZPixmap(
 	ret_image = XCreateImage(display, NULL, 16, ZPixmap, 0, (char *) data,
 		width, height, 16, 0 /* will be calc'ed from bitmap_pad */);
 	if (ret_image == NULL) {
-	    ckfree((char *) data);
+	    ckfree(data);
 	    goto cleanup;
 	}
 
@@ -455,14 +455,14 @@ XGetImageZPixmap(
 
 	if (GetDIBits(hdcMem, hbmp, 0, height, ret_image->data, bmInfo,
 		DIB_RGB_COLORS) == 0) {
-	    ckfree((char *) ret_image->data);
-	    ckfree((char *) ret_image);
+	    ckfree(ret_image->data);
+	    ckfree(ret_image);
 	    ret_image = NULL;
 	    goto cleanup;
 	}
     } else {
 	GetDIBits(hdcMem, hbmp, 0, height, NULL, bmInfo, DIB_RGB_COLORS);
-	data = (unsigned char *) ckalloc(width * height * 4);
+	data = ckalloc(width * height * 4);
 	if (!data) {
 	    /* printf("Failed to allocate data area for XImage.\n"); */
 	    ret_image = NULL;
@@ -471,7 +471,7 @@ XGetImageZPixmap(
 	ret_image = XCreateImage(display, NULL, 32, ZPixmap, 0, (char *) data,
 		width, height, 0, (int) width * 4);
 	if (ret_image == NULL) {
-	    ckfree((char *) data);
+	    ckfree(data);
 	    goto cleanup;
 	}
 
@@ -485,10 +485,10 @@ XGetImageZPixmap(
 	    unsigned int byte_width, h, w;
 
 	    byte_width = ((width * 3 + 3) & ~(unsigned)3);
-	    smallBitBase = (unsigned char *) ckalloc(byte_width * height);
+	    smallBitBase = ckalloc(byte_width * height);
 	    if (!smallBitBase) {
-		ckfree((char *) ret_image->data);
-		ckfree((char *) ret_image);
+		ckfree(ret_image->data);
+		ckfree(ret_image);
 		ret_image = NULL;
 		goto cleanup;
 	    }
@@ -500,9 +500,9 @@ XGetImageZPixmap(
 
 	    if (GetDIBits(hdcMem, hbmp, 0, height, smallBitData, bmInfo,
 		    DIB_RGB_COLORS) == 0) {
-		ckfree((char *) ret_image->data);
-		ckfree((char *) ret_image);
-		ckfree((char *) smallBitBase);
+		ckfree(ret_image->data);
+		ckfree(ret_image);
+		ckfree(smallBitBase);
 		ret_image = NULL;
 		goto cleanup;
 	    }
@@ -527,7 +527,7 @@ XGetImageZPixmap(
 	     * Free the Device contexts, and the Bitmap.
 	     */
 
-	    ckfree((char *) smallBitBase);
+	    ckfree(smallBitBase);
 	} else {
 	    /*
 	     * Get the BITMAP info directly into the Image.
@@ -535,8 +535,8 @@ XGetImageZPixmap(
 
 	    if (GetDIBits(hdcMem, hbmp, 0, height, ret_image->data, bmInfo,
 		    DIB_RGB_COLORS) == 0) {
-		ckfree((char *) ret_image->data);
-		ckfree((char *) ret_image);
+		ckfree(ret_image->data);
+		ckfree(ret_image);
 		ret_image = NULL;
 		goto cleanup;
 	    }
@@ -545,7 +545,7 @@ XGetImageZPixmap(
 
   cleanup:
     if (bmInfo) {
-	ckfree((char *) bmInfo);
+	ckfree(bmInfo);
     }
     if (hPal) {
 	SelectPalette(hdcMem, hPalPrev1, FALSE);
@@ -662,8 +662,7 @@ XGetImage(
 
 	imagePtr = XCreateImage(display, NULL, 1, XYBitmap, 0, NULL,
 		width, height, 32, 0);
-	imagePtr->data =
-		ckalloc((unsigned) imagePtr->bytes_per_line*imagePtr->height);
+	imagePtr->data = ckalloc(imagePtr->bytes_per_line * imagePtr->height);
 
 	dc = GetDC(NULL);