hw/xwin: Remove unnecessary casts from malloc/realloc/calloc calls
Remove unnecessary casts from malloc/realloc/calloc calls. This is the style used for the majority of X server code. Signed-off-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
This commit is contained in:
parent
94f709cfce
commit
0fc84a2bb6
|
@ -1613,7 +1613,7 @@ glxWinCreateContext(__GLXscreen * screen,
|
|||
glxWinReleaseTexImage
|
||||
};
|
||||
|
||||
context = (__GLXWinContext *) calloc(1, sizeof(__GLXWinContext));
|
||||
context = calloc(1, sizeof(__GLXWinContext));
|
||||
|
||||
if (!context)
|
||||
return NULL;
|
||||
|
|
|
@ -58,7 +58,7 @@ winAllocatePrivates(ScreenPtr pScreen)
|
|||
}
|
||||
|
||||
/* Allocate memory for the screen private structure */
|
||||
pScreenPriv = (winPrivScreenPtr) malloc(sizeof(winPrivScreenRec));
|
||||
pScreenPriv = malloc(sizeof(winPrivScreenRec));
|
||||
if (!pScreenPriv) {
|
||||
ErrorF("winAllocateScreenPrivates - malloc () failed\n");
|
||||
return FALSE;
|
||||
|
@ -150,7 +150,7 @@ winAllocateCmapPrivates(ColormapPtr pCmap)
|
|||
}
|
||||
|
||||
/* Allocate memory for our private structure */
|
||||
pCmapPriv = (winPrivCmapPtr) malloc(sizeof(winPrivCmapRec));
|
||||
pCmapPriv = malloc(sizeof(winPrivCmapRec));
|
||||
if (!pCmapPriv) {
|
||||
ErrorF("winAllocateCmapPrivates - malloc () failed\n");
|
||||
return FALSE;
|
||||
|
|
|
@ -248,7 +248,7 @@ winClipboardFlushXEvents(HWND hwnd,
|
|||
(LPCWSTR) pszGlobalData,
|
||||
-1, NULL, 0, NULL, NULL);
|
||||
/* NOTE: iConvertDataLen includes space for null terminator */
|
||||
pszConvertData = (char *) malloc(iConvertDataLen);
|
||||
pszConvertData = malloc(iConvertDataLen);
|
||||
WideCharToMultiByte(CP_UTF8,
|
||||
0,
|
||||
(LPCWSTR) pszGlobalData,
|
||||
|
@ -581,8 +581,7 @@ winClipboardFlushXEvents(HWND hwnd,
|
|||
pszReturnData, -1, NULL, 0);
|
||||
|
||||
/* Allocate memory for the Unicode string */
|
||||
pwszUnicodeStr
|
||||
= (wchar_t *) malloc(sizeof(wchar_t) * (iUnicodeLen + 1));
|
||||
pwszUnicodeStr = malloc(sizeof(wchar_t) * (iUnicodeLen + 1));
|
||||
if (!pwszUnicodeStr) {
|
||||
ErrorF("winClipboardFlushXEvents - SelectionNotify "
|
||||
"malloc failed for pwszUnicodeStr, aborting.\n");
|
||||
|
|
|
@ -255,10 +255,8 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
|
|||
bi.bV4BlueMask = 0x000000FF;
|
||||
bi.bV4AlphaMask = 0xFF000000;
|
||||
|
||||
lpBits =
|
||||
(uint32_t *) calloc(pScreenPriv->cursor.sm_cx *
|
||||
pScreenPriv->cursor.sm_cy,
|
||||
sizeof(uint32_t));
|
||||
lpBits = calloc(pScreenPriv->cursor.sm_cx * pScreenPriv->cursor.sm_cy,
|
||||
sizeof(uint32_t));
|
||||
|
||||
if (lpBits) {
|
||||
int y;
|
||||
|
@ -302,9 +300,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen)
|
|||
pbmiColors[2].rgbBlue = pCursor->foreBlue >> 8;
|
||||
pbmiColors[2].rgbReserved = 0;
|
||||
|
||||
lpBits =
|
||||
(uint32_t *) calloc(pScreenPriv->cursor.sm_cx *
|
||||
pScreenPriv->cursor.sm_cy, sizeof(char));
|
||||
lpBits = calloc(pScreenPriv->cursor.sm_cx * pScreenPriv->cursor.sm_cy, 1);
|
||||
|
||||
pCur = (unsigned char *) lpBits;
|
||||
if (lpBits) {
|
||||
|
|
|
@ -405,7 +405,7 @@ Xutf8TextPropertyToString(Display * pDisplay, XTextProperty * xtp)
|
|||
|
||||
for (i = 0; i < nNum; i++)
|
||||
iLen += strlen(ppList[i]);
|
||||
pszReturnData = (char *) malloc(iLen + 1);
|
||||
pszReturnData = malloc(iLen + 1);
|
||||
pszReturnData[0] = '\0';
|
||||
for (i = 0; i < nNum; i++)
|
||||
strcat(pszReturnData, ppList[i]);
|
||||
|
@ -413,7 +413,7 @@ Xutf8TextPropertyToString(Display * pDisplay, XTextProperty * xtp)
|
|||
XFreeStringList(ppList);
|
||||
}
|
||||
else {
|
||||
pszReturnData = (char *) malloc(1);
|
||||
pszReturnData = malloc(1);
|
||||
pszReturnData[0] = '\0';
|
||||
}
|
||||
|
||||
|
@ -537,7 +537,7 @@ UpdateName(WMInfoPtr pWMInfo, Window iWindow)
|
|||
int iLen =
|
||||
MultiByteToWideChar(CP_UTF8, 0, pszWindowName, -1, NULL, 0);
|
||||
wchar_t *pwszWideWindowName =
|
||||
(wchar_t *) malloc(sizeof(wchar_t) * (iLen + 1));
|
||||
malloc(sizeof(wchar_t)*(iLen + 1));
|
||||
MultiByteToWideChar(CP_UTF8, 0, pszWindowName, -1,
|
||||
pwszWideWindowName, iLen);
|
||||
|
||||
|
@ -1237,9 +1237,9 @@ winInitWM(void **ppWMInfo,
|
|||
pthread_mutex_t * ppmServerStarted,
|
||||
int dwScreen, HWND hwndScreen, BOOL allowOtherWM)
|
||||
{
|
||||
WMProcArgPtr pArg = (WMProcArgPtr) malloc(sizeof(WMProcArgRec));
|
||||
WMInfoPtr pWMInfo = (WMInfoPtr) malloc(sizeof(WMInfoRec));
|
||||
XMsgProcArgPtr pXMsgArg = (XMsgProcArgPtr) malloc(sizeof(XMsgProcArgRec));
|
||||
WMProcArgPtr pArg = malloc(sizeof(WMProcArgRec));
|
||||
WMInfoPtr pWMInfo = malloc(sizeof(WMInfoRec));
|
||||
XMsgProcArgPtr pXMsgArg = malloc(sizeof(XMsgProcArgRec));
|
||||
|
||||
/* Bail if the input parameters are bad */
|
||||
if (pArg == NULL || pWMInfo == NULL || pXMsgArg == NULL) {
|
||||
|
@ -1432,7 +1432,7 @@ winSendMessageToWM(void *pWMInfo, winWMMessagePtr pMsg)
|
|||
ErrorF("winSendMessageToWM ()\n");
|
||||
#endif
|
||||
|
||||
pNode = (WMMsgNodePtr) malloc(sizeof(WMMsgNodeRec));
|
||||
pNode = malloc(sizeof(WMMsgNodeRec));
|
||||
if (pNode != NULL) {
|
||||
memcpy(&pNode->msg, pMsg, sizeof(winWMMessageRec));
|
||||
PushMessage(&((WMInfoPtr) pWMInfo)->wmMsgQueue, pNode);
|
||||
|
|
|
@ -344,8 +344,7 @@ winCreateDIBNativeGDI(int iWidth, int iHeight, int iDepth,
|
|||
}
|
||||
|
||||
/* Allocate bitmap info header */
|
||||
pbmih = (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
|
||||
+ 256 * sizeof(RGBQUAD));
|
||||
pbmih = malloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
|
||||
if (pbmih == NULL) {
|
||||
ErrorF("winCreateDIBNativeGDI - malloc () failed\n");
|
||||
return FALSE;
|
||||
|
|
|
@ -45,7 +45,7 @@ extern void ErrorF (const char* /*f*/, ...);
|
|||
static char *makestr(char *str)
|
||||
{
|
||||
char *ptr;
|
||||
ptr = (char*)malloc (strlen(str)+1);
|
||||
ptr = malloc(strlen(str)+1);
|
||||
if (!ptr)
|
||||
{
|
||||
ErrorF ("winMultiWindowLex:makestr() out of memory\n");
|
||||
|
|
|
@ -311,10 +311,9 @@ static void
|
|||
AddMenuLine (char *text, MENUCOMMANDTYPE cmd, char *param)
|
||||
{
|
||||
if (menu.menuItem==NULL)
|
||||
menu.menuItem = (MENUITEM*)malloc(sizeof(MENUITEM));
|
||||
menu.menuItem = malloc(sizeof(MENUITEM));
|
||||
else
|
||||
menu.menuItem = (MENUITEM*)
|
||||
realloc(menu.menuItem, sizeof(MENUITEM)*(menu.menuItems+1));
|
||||
menu.menuItem = realloc(menu.menuItem, sizeof(MENUITEM)*(menu.menuItems+1));
|
||||
|
||||
strncpy (menu.menuItem[menu.menuItems].text, text, MENU_MAX);
|
||||
menu.menuItem[menu.menuItems].text[MENU_MAX] = 0;
|
||||
|
@ -339,10 +338,9 @@ CloseMenu (void)
|
|||
}
|
||||
|
||||
if (pref.menuItems)
|
||||
pref.menu = (MENUPARSED*)
|
||||
realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED));
|
||||
pref.menu = realloc (pref.menu, (pref.menuItems+1)*sizeof(MENUPARSED));
|
||||
else
|
||||
pref.menu = (MENUPARSED*)malloc (sizeof(MENUPARSED));
|
||||
pref.menu = malloc (sizeof(MENUPARSED));
|
||||
|
||||
memcpy (pref.menu+pref.menuItems, &menu, sizeof(MENUPARSED));
|
||||
pref.menuItems++;
|
||||
|
@ -365,10 +363,9 @@ static void
|
|||
AddIconLine (char *matchstr, char *iconfile)
|
||||
{
|
||||
if (pref.icon==NULL)
|
||||
pref.icon = (ICONITEM*)malloc(sizeof(ICONITEM));
|
||||
pref.icon = malloc(sizeof(ICONITEM));
|
||||
else
|
||||
pref.icon = (ICONITEM*)
|
||||
realloc(pref.icon, sizeof(ICONITEM)*(pref.iconItems+1));
|
||||
pref.icon = realloc(pref.icon, sizeof(ICONITEM)*(pref.iconItems+1));
|
||||
|
||||
strncpy(pref.icon[pref.iconItems].match, matchstr, MENU_MAX);
|
||||
pref.icon[pref.iconItems].match[MENU_MAX] = 0;
|
||||
|
@ -401,10 +398,9 @@ static void
|
|||
AddStyleLine (char *matchstr, unsigned long style)
|
||||
{
|
||||
if (pref.style==NULL)
|
||||
pref.style = (STYLEITEM*)malloc(sizeof(STYLEITEM));
|
||||
pref.style = malloc(sizeof(STYLEITEM));
|
||||
else
|
||||
pref.style = (STYLEITEM*)
|
||||
realloc(pref.style, sizeof(STYLEITEM)*(pref.styleItems+1));
|
||||
pref.style = realloc(pref.style, sizeof(STYLEITEM)*(pref.styleItems+1));
|
||||
|
||||
strncpy(pref.style[pref.styleItems].match, matchstr, MENU_MAX);
|
||||
pref.style[pref.styleItems].match[MENU_MAX] = 0;
|
||||
|
@ -434,10 +430,9 @@ static void
|
|||
AddSysMenuLine (char *matchstr, char *menuname, int pos)
|
||||
{
|
||||
if (pref.sysMenu==NULL)
|
||||
pref.sysMenu = (SYSMENUITEM*)malloc(sizeof(SYSMENUITEM));
|
||||
pref.sysMenu = malloc(sizeof(SYSMENUITEM));
|
||||
else
|
||||
pref.sysMenu = (SYSMENUITEM*)
|
||||
realloc(pref.sysMenu, sizeof(SYSMENUITEM)*(pref.sysMenuItems+1));
|
||||
pref.sysMenu = realloc(pref.sysMenu, sizeof(SYSMENUITEM)*(pref.sysMenuItems+1));
|
||||
|
||||
strncpy (pref.sysMenu[pref.sysMenuItems].match, matchstr, MENU_MAX);
|
||||
pref.sysMenu[pref.sysMenuItems].match[MENU_MAX] = 0;
|
||||
|
|
|
@ -184,8 +184,7 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen)
|
|||
}
|
||||
|
||||
/* Allocate a bitmap header and color table */
|
||||
pbmih = (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
|
||||
+ 256 * sizeof(RGBQUAD));
|
||||
pbmih = malloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
|
||||
if (pbmih == NULL) {
|
||||
ErrorF("winQueryRGBBitsAndMasks - malloc failed\n");
|
||||
return FALSE;
|
||||
|
@ -545,8 +544,7 @@ winInitScreenShadowGDI(ScreenPtr pScreen)
|
|||
pScreenPriv->hdcShadow = CreateCompatibleDC(pScreenPriv->hdcScreen);
|
||||
|
||||
/* Allocate bitmap info header */
|
||||
pScreenPriv->pbmih = (BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
|
||||
+ 256 * sizeof(RGBQUAD));
|
||||
pScreenPriv->pbmih = malloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
|
||||
if (pScreenPriv->pbmih == NULL) {
|
||||
ErrorF("winInitScreenShadowGDI - malloc () failed\n");
|
||||
return FALSE;
|
||||
|
|
|
@ -184,8 +184,8 @@ InitWin32RootlessEngine(win32RootlessWindowPtr pRLWinPriv)
|
|||
|
||||
/* Allocate bitmap info header */
|
||||
pRLWinPriv->pbmihShadow =
|
||||
(BITMAPINFOHEADER *) malloc(sizeof(BITMAPINFOHEADER)
|
||||
+ 256 * sizeof(RGBQUAD));
|
||||
malloc(sizeof(BITMAPINFOHEADER)
|
||||
+ 256 * sizeof(RGBQUAD));
|
||||
if (pRLWinPriv->pbmihShadow == NULL) {
|
||||
ErrorF("InitWin32RootlessEngine - malloc () failed\n");
|
||||
return;
|
||||
|
@ -214,8 +214,7 @@ winMWExtWMCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
|
|||
newX, newY, pFrame->width, pFrame->height);
|
||||
#endif
|
||||
|
||||
pRLWinPriv =
|
||||
(win32RootlessWindowPtr) malloc(sizeof(win32RootlessWindowRec));
|
||||
pRLWinPriv = malloc(sizeof(win32RootlessWindowRec));
|
||||
pRLWinPriv->pFrame = pFrame;
|
||||
pRLWinPriv->pfb = NULL;
|
||||
pRLWinPriv->hbmpShadow = NULL;
|
||||
|
|
|
@ -155,7 +155,7 @@ winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
|
|||
nbox = RegionNumRects(prgnDst);
|
||||
|
||||
/* Allocate source points for each box */
|
||||
if (!(pptSrc = (DDXPointPtr) malloc(nbox * sizeof(DDXPointRec))))
|
||||
if (!(pptSrc = malloc(nbox * sizeof(DDXPointRec))))
|
||||
return;
|
||||
|
||||
/* Set an iterator pointer */
|
||||
|
|
|
@ -162,7 +162,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
|
|||
}
|
||||
|
||||
/* build the entry */
|
||||
pNewEvent = (WMEventPtr) malloc(sizeof(WMEventRec));
|
||||
pNewEvent = malloc(sizeof(WMEventRec));
|
||||
if (!pNewEvent)
|
||||
return BadAlloc;
|
||||
pNewEvent->next = 0;
|
||||
|
@ -183,7 +183,7 @@ ProcWindowsWMSelectInput(ClientPtr client)
|
|||
* done through the resource database.
|
||||
*/
|
||||
if (!pHead) {
|
||||
pHead = (WMEventPtr *) malloc(sizeof(WMEventPtr));
|
||||
pHead = malloc(sizeof(WMEventPtr));
|
||||
if (!pHead ||
|
||||
!AddResource(eventResource, eventResourceType, (void *) pHead))
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user