Commit d33cf044 authored by Alan Coopersmith's avatar Alan Coopersmith Committed by Ulrich Sibiller

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: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent c161df4f
...@@ -111,7 +111,7 @@ XcmsCreateCCC( ...@@ -111,7 +111,7 @@ XcmsCreateCCC(
XcmsPerScrnInfo *pNewScrnInfo; XcmsPerScrnInfo *pNewScrnInfo;
if (pDefaultCCC == NULL || if (pDefaultCCC == NULL ||
!(newccc = Xcalloc(1, (unsigned) sizeof(XcmsCCCRec)))) { !(newccc = Xcalloc(1, sizeof(XcmsCCCRec)))) {
return(NULL); return(NULL);
} }
...@@ -144,8 +144,7 @@ XcmsCreateCCC( ...@@ -144,8 +144,7 @@ XcmsCreateCCC(
* If one exists replace the pPerScrnInfo. * If one exists replace the pPerScrnInfo.
*/ */
if ((pIMap = _XcmsGetIntensityMap(dpy, visual)) != NULL) { if ((pIMap = _XcmsGetIntensityMap(dpy, visual)) != NULL) {
if (!(pNewScrnInfo = if (!(pNewScrnInfo = Xcalloc(1, sizeof(XcmsPerScrnInfo)))) {
Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) {
Xfree(newccc); Xfree(newccc);
return(NULL); return(NULL);
} }
......
...@@ -128,7 +128,7 @@ _XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return) ...@@ -128,7 +128,7 @@ _XIMVaToNestedList(va_list var, int max_count, XIMArg **args_return)
return; return;
} }
args = Xmalloc((unsigned)(max_count + 1) * sizeof(XIMArg)); args = Xmalloc(((unsigned)max_count + 1) * sizeof(XIMArg));
*args_return = args; *args_return = args;
if (!args) return; if (!args) return;
......
...@@ -250,8 +250,7 @@ _XcmsAddCmapRec( ...@@ -250,8 +250,7 @@ _XcmsAddCmapRec(
{ {
XcmsCmapRec *pNew; XcmsCmapRec *pNew;
if ((pNew = Xcalloc(1, (unsigned) sizeof(XcmsCmapRec))) if ((pNew = Xcalloc(1, sizeof(XcmsCmapRec))) == NULL) {
== NULL) {
return((XcmsCmapRec *)NULL); return((XcmsCmapRec *)NULL);
} }
...@@ -301,7 +300,7 @@ _XcmsCopyCmapRecAndFree( ...@@ -301,7 +300,7 @@ _XcmsCopyCmapRecAndFree(
pRec_copy =_XcmsAddCmapRec(dpy, copy_cmap, pRec_src->windowID, pRec_copy =_XcmsAddCmapRec(dpy, copy_cmap, pRec_src->windowID,
pRec_src->visual); pRec_src->visual);
if (pRec_copy != NULL && pRec_src->ccc) { 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, memcpy((char *)pRec_copy->ccc, (char *)pRec_src->ccc,
sizeof(XcmsCCCRec)); sizeof(XcmsCCCRec));
} }
......
...@@ -183,7 +183,7 @@ _XcmsInitDefaultCCCs( ...@@ -183,7 +183,7 @@ _XcmsInitDefaultCCCs(
* Create an array of XcmsCCC structures, one for each screen. * Create an array of XcmsCCC structures, one for each screen.
* They serve as the screen's default CCC. * 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); return(0);
} }
dpy->cms.defaultCCCs = (XPointer)ccc; dpy->cms.defaultCCCs = (XPointer)ccc;
...@@ -322,7 +322,7 @@ _XcmsInitScrnInfo( ...@@ -322,7 +322,7 @@ _XcmsInitScrnInfo(
* here are referenced by the default CCC. * here are referenced by the default CCC.
*/ */
if (!(defaultccc->pPerScrnInfo = if (!(defaultccc->pPerScrnInfo =
Xcalloc(1, (unsigned) sizeof(XcmsPerScrnInfo)))) { Xcalloc(1, sizeof(XcmsPerScrnInfo)))) {
return(0); return(0);
} }
defaultccc->pPerScrnInfo->state = XcmsInitNone; defaultccc->pPerScrnInfo->state = XcmsInitNone;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment