fdo-mirrors/xorg-libx11
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/lib/libx11.git synced 2026-05-05 14:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Alan Coopersmith 2013-08-10 23:57:55 -07:00
parent 25a7a329de
commit 6ead9dd92a
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/xcms/CCC.c
View file

@ -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);
}

5
src/xcms/cmsCmap.c
View file

@ -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));
}

4
src/xcms/cmsInt.c
View file

@ -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;

2
src/xlibi18n/ICWrap.c
View file

@ -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;