diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-08-10 23:57:55 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-08-20 12:51:09 -0700 |
commit | 6ead9dd92ab90aabd9f0e328d59597e6b5bc09d3 (patch) | |
tree | 73e604437b5211234eb5d89fa9df60e4c88f6384 /src | |
parent | 25a7a329def672fc8d26078538173777850c6390 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/xcms/CCC.c | 5 | ||||
-rw-r--r-- | src/xcms/cmsCmap.c | 5 | ||||
-rw-r--r-- | src/xcms/cmsInt.c | 4 | ||||
-rw-r--r-- | src/xlibi18n/ICWrap.c | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c index da8b661d..de6d6318 100644 --- a/src/xcms/CCC.c +++ b/src/xcms/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/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c index 45843e3b..8db6ffe3 100644 --- a/src/xcms/cmsCmap.c +++ b/src/xcms/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/src/xcms/cmsInt.c b/src/xcms/cmsInt.c index cefa1e68..f4aef04f 100644 --- a/src/xcms/cmsInt.c +++ b/src/xcms/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; diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c index 8584e36a..dadc8f54 100644 --- a/src/xlibi18n/ICWrap.c +++ b/src/xlibi18n/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; |