Fix warning: warning C4047: 'function': 'char *' differs in levels of…

… indirection from 'const char **' on Windows. Remove unneeded (char *) typecast in ckfree() usage
tcltk · Oct 9, 2024 · b592080 · b592080
1 parent e301c28
commit b592080
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/doc/SplitList.3 b/doc/SplitList.3
@@ -95,7 +95,7 @@ Then you should eventually free the storage with a call like the
 following:
 .PP
 .CS
-ckfree((char *)argv);
+ckfree(argv);
 .CE
 .PP
 \fBTcl_SplitList\fR normally returns \fBTCL_OK\fR, which means the list was

diff --git a/doc/SplitPath.3 b/doc/SplitPath.3
@@ -74,7 +74,7 @@ Then you should eventually free the storage with a call like the
 following:
 .PP
 .CS
-ckfree((char *)argv);
+ckfree(argv);
 .CE
 .PP
 \fBTcl_JoinPath\fR is the inverse of \fBTcl_SplitPath\fR: it takes a

diff --git a/generic/tclArithSeries.c b/generic/tclArithSeries.c
@@ -284,10 +284,10 @@ FreeArithSeriesInternalRep(Tcl_Obj *arithSeriesObjPtr)  /* Free any allocated me
 	for(i=0; i<arithSeriesRepPtr->len; i++) {
 	    Tcl_DecrRefCount(arithSeriesRepPtr->elements[i]);
 	}
-	ckfree((char *)arithSeriesRepPtr->elements);
+	ckfree(arithSeriesRepPtr->elements);
 	arithSeriesRepPtr->elements = NULL;
     }
-    ckfree((char *)arithSeriesRepPtr);
+    ckfree(arithSeriesRepPtr);
 }
 
 
@@ -1009,7 +1009,7 @@ TclArithSeriesObjReverse(
 	    for (i=0; i<len; i++) {
 		Tcl_DecrRefCount(arithSeriesRepPtr->elements[i]);
 	    }
-	    ckfree((char*)arithSeriesRepPtr->elements);
+	    ckfree(arithSeriesRepPtr->elements);
 	}
 	arithSeriesRepPtr->elements = NULL;
 

diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
@@ -4985,7 +4985,7 @@ Tcl_LsortObjCmd(
     }
     if (elementArray) {
 	if (elmArrSize <= MAXCALLOC) {
-	    ckfree((char *)elementArray);
+	    ckfree(elementArray);
 	} else {
 	    free((char *)elementArray);
 	}

diff --git a/generic/tclDecls.h b/generic/tclDecls.h
@@ -4273,7 +4273,7 @@ extern const TclStubs *tclStubsPtr;
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(__result, TCL_INDEX_NONE)); \
 	    if (__result != NULL && __freeProc != NULL && __freeProc != TCL_VOLATILE) { \
 		if (__freeProc == TCL_DYNAMIC) { \
-		    ckfree((char *)__result); \
+		    ckfree(__result); \
 		} else { \
 		    (*__freeProc)((char *)__result); \
 		} \

diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
@@ -2574,7 +2574,7 @@ ClearTable(
 	    Tcl_DecrRefCount(prefixObj);
 	    hPtr = Tcl_NextHashEntry(&search);
 	}
-	ckfree((char *) ensemblePtr->subcommandArrayPtr);
+	ckfree(ensemblePtr->subcommandArrayPtr);
     }
     Tcl_DeleteHashTable(hash);
 }

diff --git a/generic/tclInt.h b/generic/tclInt.h
@@ -4315,7 +4315,7 @@ MODULE_SCOPE void	TclDbInitNewObj(Tcl_Obj *objPtr, const char *file,
 	Tcl_Obj *_isobjPtr = (Tcl_Obj *)(objPtr);			\
 	if (_isobjPtr->bytes != NULL) {					\
 	    if (_isobjPtr->bytes != &tclEmptyString) {			\
-		ckfree((char *)_isobjPtr->bytes);			\
+		ckfree(_isobjPtr->bytes);			\
 	    }								\
 	    _isobjPtr->bytes = NULL;					\
 	}								\

diff --git a/generic/tclLink.c b/generic/tclLink.c
@@ -1491,7 +1491,7 @@ LinkFree(
     if (linkPtr->flags & LINK_ALLOC_LAST) {
 	ckfree(linkPtr->lastValue.aryPtr);
     }
-    ckfree((char *)linkPtr);
+    ckfree(linkPtr);
 }
 
 /*

diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
@@ -1592,7 +1592,7 @@ TclParseNumber(
 	    const char **argv;
 	    if ((TclMaxListLength(bytes, TCL_INDEX_NONE, NULL) > 1)
 		    && Tcl_SplitList(NULL, bytes, &argc, &argv) == TCL_OK) {
-		Tcl_Free(argv);
+		ckfree(argv);
 		Tcl_AppendToObj(msg, "a list", -1);
 	    } else {
 		Tcl_AppendToObj(msg, "\"", -1);

diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
@@ -41,7 +41,7 @@
 /* MODULE_SCOPE void* TclBNRealloc( void*, size_t ); */
 #define TclBNRealloc(x,s) ((void*)attemptckrealloc((char*)(x),(size_t)(s)))
 /* MODULE_SCOPE void  TclBNFree( void* ); */
-#define TclBNFree(x) (ckfree((char*)(x)))
+#define TclBNFree(x) (ckfree(x))
 
 #undef MP_MALLOC
 #undef MP_CALLOC