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

using useful casts internally.

2 files changed, 6 insertions, 7 deletions

diff --git a/xlib/xgc.c b/xlib/xgc.c
index a2a7087..bbc5746 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -52,7 +52,7 @@ static TkpClipMask *AllocClipMask(GC gc) {
     TkpClipMask *clip_mask = (TkpClipMask*) gc->clip_mask;
     
     if (clip_mask == None) {
-	clip_mask = (TkpClipMask*) ckalloc(sizeof(TkpClipMask));
+	clip_mask = ckalloc(sizeof(TkpClipMask));
 	gc->clip_mask = (Pixmap) clip_mask;
 #ifdef MAC_OSX_TK
     } else if (clip_mask->type == TKP_CLIP_REGION) {
@@ -85,7 +85,7 @@ static void FreeClipMask(GC gc) {
 	    TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region);
 	}
 #endif
-	ckfree((char*) gc->clip_mask);
+	ckfree(gc->clip_mask);
 	gc->clip_mask = None;
     }
 }
@@ -124,8 +124,7 @@ XCreateGC(
 
 #define MAX_DASH_LIST_SIZE 10
 
-    gp = (XGCValues *) ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE +
-	    gcCacheSize);
+    gp = ckalloc(sizeof(XGCValues) + MAX_DASH_LIST_SIZE + gcCacheSize);
     if (!gp) {
 	return None;
     }
@@ -272,7 +271,7 @@ void XFreeGC(
     if (gc != None) {
 	FreeClipMask(gc);
 	TkpFreeGCCache(gc);
-	ckfree((char *) gc);
+	ckfree(gc);
     }
 }
 
diff --git a/xlib/xutil.c b/xlib/xutil.c
index d5e26eb..b265e5d 100644
--- a/xlib/xutil.c
+++ b/xlib/xutil.c
@@ -70,7 +70,7 @@ XGetVisualInfo(
     XVisualInfo *vinfo_template,
     int *nitems_return)
 {
-    XVisualInfo *info = (XVisualInfo *) ckalloc(sizeof(XVisualInfo));
+    XVisualInfo *info = ckalloc(sizeof(XVisualInfo));
 
     info->visual = DefaultVisual(display, 0);
     info->visualid = info->visual->visualid;
@@ -102,7 +102,7 @@ XGetVisualInfo(
 	    || ((vinfo_mask & VisualBlueMaskMask)
 		    && (vinfo_template->blue_mask != info->blue_mask))
 	) {
-	ckfree((char *) info);
+	ckfree(info);
 	return NULL;
     }