Don't cast sizeof() results to unsigned when passing to Xmalloc/Xcalloc

sizeof() returns size_t, malloc() & calloc() expect sizes in size_t,
don't strip down to unsigned int and re-expand unnecessarily.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

4 files changed, 7 insertions, 9 deletions

diff --git a/nx-X11/lib/X11/CCC.c b/nx-X11/lib/X11/CCC.c
index da8b661dc..de6d6318a 100644
--- a/nx-X11/lib/X11/CCC.c
+++ b/nx-X11/lib/X11/CCC.c
@@ -111,7 +111,7 @@ XcmsCreateCCC(
     XcmsPerScrnInfo *pNewScrnInfo;
 
     if (pDefaultCCC == NULL ||
-	    !(newccc = Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) {
+	    !(newccc = Xcalloc(1, sizeof(XcmsCCCRec)))) {
 	return(NULL);
     }
 
@@ -144,8 +144,7 @@ XcmsCreateCCC(
      * If one exists replace the pPerScrnInfo.
      */
     if ((pIMap = _XcmsGetIntensityMap(dpy, visual)) != NULL) {
-	if (!(pNewScrnInfo =
-		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
+	if (!(pNewScrnInfo = Xcalloc(1, sizeof(XcmsPerScrnInfo)))) {
 	    Xfree(newccc);
 	    return(NULL);
 	}
diff --git a/nx-X11/lib/X11/ICWrap.c b/nx-X11/lib/X11/ICWrap.c
index 8584e36a7..dadc8f541 100644
--- a/nx-X11/lib/X11/ICWrap.c
+++ b/nx-X11/lib/X11/ICWrap.c
@@ -128,7 +128,7 @@ _XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return)
 	return;
     }
 
-    args = Xmalloc((unsigned)(max_count + 1) * sizeof(XIMArg));
+    args = Xmalloc(((unsigned)max_count + 1) * sizeof(XIMArg));
     *args_return = args;
     if (!args) return;
 
diff --git a/nx-X11/lib/X11/cmsCmap.c b/nx-X11/lib/X11/cmsCmap.c
index 45843e3b8..8db6ffe30 100644
--- a/nx-X11/lib/X11/cmsCmap.c
+++ b/nx-X11/lib/X11/cmsCmap.c
@@ -250,8 +250,7 @@ _XcmsAddCmapRec(
 {
     XcmsCmapRec *pNew;
 
-    if ((pNew = Xcalloc(1, (unsigned) sizeof(XcmsCmapRec)))
-	    == NULL) {
+    if ((pNew = Xcalloc(1, sizeof(XcmsCmapRec))) == NULL) {
 	return((XcmsCmapRec *)NULL);
     }
 
@@ -301,7 +300,7 @@ _XcmsCopyCmapRecAndFree(
 	pRec_copy =_XcmsAddCmapRec(dpy, copy_cmap, pRec_src->windowID,
 		pRec_src->visual);
 	if (pRec_copy != NULL && pRec_src->ccc) {
-	    pRec_copy->ccc = Xcalloc(1, (unsigned) sizeof(XcmsCCCRec));
+	    pRec_copy->ccc = Xcalloc(1, sizeof(XcmsCCCRec));
 	    memcpy((char *)pRec_copy->ccc, (char *)pRec_src->ccc,
 		   sizeof(XcmsCCCRec));
 	}
diff --git a/nx-X11/lib/X11/cmsInt.c b/nx-X11/lib/X11/cmsInt.c
index cefa1e680..f4aef04ff 100644
--- a/nx-X11/lib/X11/cmsInt.c
+++ b/nx-X11/lib/X11/cmsInt.c
@@ -183,7 +183,7 @@ _XcmsInitDefaultCCCs(
      * Create an array of XcmsCCC structures, one for each screen.
      * They serve as the screen's default CCC.
      */
-    if (!(ccc = Xcalloc((unsigned)nScrn, (unsigned) sizeof(XcmsCCCRec)))) {
+    if (!(ccc = Xcalloc((unsigned)nScrn, sizeof(XcmsCCCRec)))) {
 	return(0);
     }
     dpy->cms.defaultCCCs = (XPointer)ccc;
@@ -322,7 +322,7 @@ _XcmsInitScrnInfo(
 	 * here are referenced by the default CCC.
 	 */
 	if (!(defaultccc->pPerScrnInfo =
-		Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
+		Xcalloc(1, sizeof(XcmsPerScrnInfo)))) {
 	    return(0);
 	}
 	defaultccc->pPerScrnInfo->state = XcmsInitNone;