casa-mp-base

Description: Patch adds explicit casts to intptr_t or uintptr_t types

    to prevent casting to/from pointer from/to integers of different size.

Author: Sergei Golovan

Last-Modified: Wed, 09 Jul 2014 19:20:07 +0400

​

--- a/generic/bltBgexec.c

+++ b/generic/bltBgexec.c

@@ -668,7 +668,7 @@

     sinkPtr->name = name;

     sinkPtr->echo = FALSE;

     sinkPtr->fd = -1;

-    sinkPtr->file = (Tcl_File)NULL;

+    sinkPtr->file = (Tcl_File)0;

     sinkPtr->byteArr = sinkPtr->staticSpace;

     sinkPtr->size = DEF_BUFFER_SIZE;

     sinkPtr->encoding = encoding;

@@ -726,7 +726,7 @@

    Blt_Free(sinkPtr->byteArr);

     }

     sinkPtr->fd = -1;

-    sinkPtr->file = (Tcl_File)NULL;

+    sinkPtr->file = (Tcl_File)0;

 #if (TCL_MAJOR_VERSION >= 8)

     if (sinkPtr->objv != NULL) {

    register int i;

@@ -883,7 +883,7 @@

 #else

    Tcl_DeleteFileHandler(sinkPtr->fd);

 #endif

-   sinkPtr->file = (Tcl_File)NULL;

+   sinkPtr->file = (Tcl_File)0;

    sinkPtr->fd = -1;

 #if WINDEBUG

--- a/generic/bltTree.c

+++ b/generic/bltTree.c

@@ -424,7 +424,7 @@

     TreeDestroyValues(nodePtr);

     UnlinkNode(nodePtr);

     treeObjPtr->nNodes--;

-    hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)nodePtr->inode);

+    hPtr = Blt_FindHashEntry(&treeObjPtr->nodeTable, (char *)(intptr_t)nodePtr->inode);

     assert(hPtr);

     Blt_DeleteHashEntry(&treeObjPtr->nodeTable, hPtr);

     nodePtr->inode = -1;

@@ -934,7 +934,7 @@

     /* Generate an unique serial number for this node.  */

     do {

    inode = treeObjPtr->nextInode++;

-   hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)inode, 

+   hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)(intptr_t)inode, 

           &isNew);

     } while (!isNew);

     nodePtr = NewNode(treeObjPtr, name, inode);

@@ -1030,7 +1030,7 @@

     int isNew, result;

     treeObjPtr = parentPtr->treeObject;

-    hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)inode, &isNew);

+    hPtr = Blt_CreateHashEntry(&treeObjPtr->nodeTable,(char *)(intptr_t)inode, &isNew);

     if (!isNew) {

    return NULL;

     }