diff options
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
26 files changed, 106 insertions, 106 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 4f0173db0..895de1ef8 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -362,7 +362,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) if ((size = strlen(argv[i])) < 1024) { - if ((nxagentOptionFile = xalloc(size + 1)) == NULL) + if ((nxagentOptionFile = malloc(size + 1)) == NULL) { FatalError("malloc failed"); } @@ -726,7 +726,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) if ((size = strlen(argv[i])) < 256) { - if ((nxagentKeyboard = xalloc(size + 1)) == NULL) + if ((nxagentKeyboard = malloc(size + 1)) == NULL) { FatalError("malloc failed"); } @@ -1537,7 +1537,7 @@ void nxagentProcessOptionsFile() goto nxagentProcessOptionsFileClose; } - if ((data = xalloc(sizeOfFile + 1)) == NULL) + if ((data = malloc(sizeOfFile + 1)) == NULL) { fprintf(stderr, "Warning: Memory allocation failed processing file '%s'.\n", validateString(nxagentOptionFile)); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 5249d8550..2fb53d440 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -1491,7 +1491,7 @@ int nxagentInitClipboard(WindowPtr pWin) lastSelectionOwner = NULL; } - lastSelectionOwner = (SelectionOwner *) xalloc(2 * sizeof(SelectionOwner)); + lastSelectionOwner = (SelectionOwner *) malloc(2 * sizeof(SelectionOwner)); if (lastSelectionOwner == NULL) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index 18c4c67a6..3905e289b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -77,7 +77,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) pVisual = pCmap->pVisual; ncolors = pVisual->ColormapEntries; - pCmap->devPriv = (void *)xalloc(sizeof(nxagentPrivColormap)); + pCmap->devPriv = (void *)malloc(sizeof(nxagentPrivColormap)); if (((visual = nxagentVisual(pVisual))) == NULL) { @@ -103,7 +103,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) switch (class) { case StaticGray: /* read only */ - colors = (XColor *)xalloc(ncolors * sizeof(XColor)); + colors = (XColor *)malloc(ncolors * sizeof(XColor)); for (i = 0; i < ncolors; i++) colors[i].pixel = i; XQueryColors(nxagentDisplay, nxagentColormap(pCmap), colors, ncolors); @@ -116,7 +116,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) break; case StaticColor: /* read only */ - colors = (XColor *)xalloc(ncolors * sizeof(XColor)); + colors = (XColor *)malloc(ncolors * sizeof(XColor)); for (i = 0; i < ncolors; i++) colors[i].pixel = i; XQueryColors(nxagentDisplay, nxagentColormap(pCmap), colors, ncolors); @@ -129,7 +129,7 @@ Bool nxagentCreateColormap(ColormapPtr pCmap) break; case TrueColor: /* read only */ - colors = (XColor *)xalloc(ncolors * sizeof(XColor)); + colors = (XColor *)malloc(ncolors * sizeof(XColor)); red = green = blue = 0L; redInc = lowbit(pVisual->redMask); greenInc = lowbit(pVisual->greenMask); @@ -229,13 +229,13 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) nxagentInstalledColormapWindows icws; int numWindows; - icws.cmapIDs = (Colormap *)xalloc(pScreen->maxInstalledCmaps * + icws.cmapIDs = (Colormap *)malloc(pScreen->maxInstalledCmaps * sizeof(Colormap)); icws.numCmapIDs = nxagentListInstalledColormaps(pScreen, icws.cmapIDs); icws.numWindows = 0; WalkTree(pScreen, nxagentCountInstalledColormapWindows, (void *)&icws); if (icws.numWindows) { - icws.windows = (Window *)xalloc((icws.numWindows + 1) * sizeof(Window)); + icws.windows = (Window *)malloc((icws.numWindows + 1) * sizeof(Window)); icws.index = 0; WalkTree(pScreen, nxagentGetInstalledColormapWindows, (void *)&icws); icws.windows[icws.numWindows] = nxagentDefaultWindows[pScreen->myNum]; @@ -255,7 +255,7 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) #ifdef _XSERVER64 { int i; - Window64 *windows = (Window64 *)xalloc(numWindows * sizeof(Window64)); + Window64 *windows = (Window64 *)malloc(numWindows * sizeof(Window64)); for(i = 0; i < numWindows; ++i) windows[i] = icws.windows[i]; @@ -437,7 +437,7 @@ void nxagentStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors) #ifdef _XSERVER64 { int i; - XColor *pColors64 = (XColor *)xalloc(nColors * sizeof(XColor) ); + XColor *pColors64 = (XColor *)malloc(nColors * sizeof(XColor) ); for(i = 0; i < nColors; ++i) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c index b1449bf13..932f7495f 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Cursor.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Cursor.c @@ -231,7 +231,7 @@ Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) bg_color.green = pCursor->backGreen; bg_color.blue = pCursor->backBlue; - pCursor->devPriv[pScreen->myNum] = (void *) xalloc(sizeof(nxagentPrivCursor)); + pCursor->devPriv[pScreen->myNum] = (void *) malloc(sizeof(nxagentPrivCursor)); nxagentCursorPriv(pCursor, pScreen)->cursor = XCreatePixmapCursor(nxagentDisplay, source, mask, &fg_color, diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 27cd0859a..86a338b3d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -1272,7 +1272,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio nxagentInitVisuals(); nxagentNumDefaultColormaps = nxagentNumVisuals; - nxagentDefaultColormaps = (Colormap *)xalloc(nxagentNumDefaultColormaps * + nxagentDefaultColormaps = (Colormap *)malloc(nxagentNumDefaultColormaps * sizeof(Colormap)); for (i = 0; i < nxagentNumDefaultColormaps; i++) @@ -1651,7 +1651,7 @@ void nxagentInitPixmapFormats() XXX: Some X server doesn't list 1 among available depths... */ - nxagentPixmapFormats = xalloc((nxagentNumDepths + 1) * sizeof(XPixmapFormatValues)); + nxagentPixmapFormats = malloc((nxagentNumDepths + 1) * sizeof(XPixmapFormatValues)); for (i = 1; i <= MAXDEPTH; i++) { @@ -2063,7 +2063,7 @@ void nxagentBackupDisplayInfo(void) free(nxagentVisualHasBeenIgnored); nxagentVisualHasBeenIgnored = NULL; } - nxagentVisualHasBeenIgnored = xalloc(nxagentNumVisuals * sizeof(Bool)); + nxagentVisualHasBeenIgnored = malloc(nxagentNumVisuals * sizeof(Bool)); nxagentDefaultDepthRecBackup = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay)); nxagentDisplayWidthRecBackup = DisplayWidth(nxagentDisplay, DefaultScreen(nxagentDisplay)); nxagentDisplayHeightRecBackup = DisplayHeight(nxagentDisplay, DefaultScreen(nxagentDisplay)); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c index a73040eeb..bf88db38c 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c @@ -223,7 +223,7 @@ int nxagentSynchronizeDrawableData(DrawablePtr pDrawable, unsigned int breakMask length = nxagentImageLength(width, height, format, leftPad, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to allocate memory for the operation.\n"); @@ -2129,7 +2129,7 @@ unsigned long nxagentGetColor(DrawablePtr pDrawable, int xPixel, int yPixel) format = (depth == 1) ? XYPixmap : ZPixmap; length = nxagentImageLength(1, 1, format, leftPad, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING fprintf(stderr, "nxagentGetColor: WARNING! Failed to allocate memory for the operation.\n"); @@ -2374,7 +2374,7 @@ void nxagentFillRemoteRegion(DrawablePtr pDrawable, RegionPtr pRegion) { pBox = RegionRects(pRegion); - pRects = xalloc(nrects * sizeof(XRectangle)); + pRects = malloc(nrects * sizeof(XRectangle)); for (i = 0; i < nrects; i++) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c index 22b3e6c88..90f545027 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Font.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c @@ -330,9 +330,9 @@ void nxagentListRemoteAddName(const char *name, int status) (nxagentRemoteFontList.length - pos) * sizeof(nxagentFontRecPtr)); } - if ((nxagentRemoteFontList.list[pos] = xalloc(sizeof(nxagentFontRec)))) + if ((nxagentRemoteFontList.list[pos] = malloc(sizeof(nxagentFontRec)))) { - nxagentRemoteFontList.list[pos]->name = xalloc(strlen(name) +1); + nxagentRemoteFontList.list[pos]->name = malloc(strlen(name) +1); if (nxagentRemoteFontList.list[pos]->name == NULL) { fprintf(stderr, "Font: remote list name memory allocation failed!.\n"); @@ -538,7 +538,7 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) name = origName; } - priv = (void *)xalloc(sizeof(nxagentPrivFont)); + priv = (void *)malloc(sizeof(nxagentPrivFont)); FontSetPrivate(pFont, nxagentFontPrivateIndex, priv); nxagentFontPriv(pFont) -> mirrorID = 0; @@ -579,14 +579,14 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont) CACHE_SIZE += 100; } - CACHE_ENTRY(CACHE_INDEX) = xalloc(sizeof(nxCacheFontEntryRec)); + CACHE_ENTRY(CACHE_INDEX) = malloc(sizeof(nxCacheFontEntryRec)); if (CACHE_ENTRY(CACHE_INDEX) == NULL) { return False; } - CACHE_NAME(CACHE_INDEX) = xalloc(strlen(name) + 1); + CACHE_NAME(CACHE_INDEX) = malloc(strlen(name) + 1); if (CACHE_NAME(CACHE_INDEX) == NULL) { @@ -753,7 +753,7 @@ static XFontStruct *nxagentLoadBestQueryFont(Display* dpy, char *fontName, FontP fprintf(stderr, "nxagentLoadBestQueryFont: Searching font '%s' .\n", fontName); #endif - substFontBuf = (char *) xalloc(sizeof(char) * 512); + substFontBuf = (char *) malloc(sizeof(char) * 512); numFontFields = nxagentSplitString(fontName, fontNameFields, FIELDS + 1, "-"); @@ -1666,7 +1666,7 @@ XFontStruct* nxagentLoadQueryFont(register Display *dpy, char *name, FontPtr pFo register long nbytes; nbytes = pFont -> info.nprops * sizeof(XFontProp); - fs -> properties = (XFontProp *) Xalloc((unsigned) nbytes); + fs -> properties = (XFontProp *) malloc((unsigned) nbytes); if (fs -> properties == NULL) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/GC.c b/nx-X11/programs/Xserver/hw/nxagent/GC.c index 21e828769..ef83b871a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GC.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GC.c @@ -673,7 +673,7 @@ void nxagentChangeClip(GCPtr pGC, int type, void * pValue, int nRects) { nRects = RegionNumRects((RegionPtr)pValue); size = nRects * sizeof(*pRects); - pRects = (XRectangle *) xalloc(size); + pRects = (XRectangle *) malloc(size); pBox = RegionRects((RegionPtr)pValue); for (i = nRects; i-- > 0;) @@ -1280,7 +1280,7 @@ static void nxagentReconnectClip(GCPtr pGC, int type, void * pValue, int nRects) { nRects = RegionNumRects((RegionPtr)pValue); size = nRects * sizeof(*pRects); - pRects = (XRectangle *) xalloc(size); + pRects = (XRectangle *) malloc(size); pBox = RegionRects((RegionPtr)pValue); for (i = nRects; i-- > 0;) { pRects[i].x = pBox[i].x1; diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c index 01a3f6a93..a50a830f9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c +++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c @@ -754,7 +754,7 @@ RegionPtr nxagentCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, length = nxagentImageLength(width, height, format, leftPad, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING fprintf(stderr, "nxagentCopyArea: WARNING! Failed to allocate memory for the operation.\n"); @@ -974,7 +974,7 @@ RegionPtr nxagentCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, length = nxagentImageLength(width, height, format, leftPad, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef DEBUG fprintf(stderr, "nxagentCopyPlane: WARNING! Failed to allocate memory for the operation.\n"); @@ -1467,7 +1467,7 @@ void nxagentFillPolygon(DrawablePtr pDrawable, GCPtr pGC, int shape, mode = CoordModePrevious; - newPoints = xalloc(nPoints * sizeof(xPoint)); + newPoints = malloc(nPoints * sizeof(xPoint)); /* * The first point is always relative diff --git a/nx-X11/programs/Xserver/hw/nxagent/Image.c b/nx-X11/programs/Xserver/hw/nxagent/Image.c index b7c3135d0..8cc8962cc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Image.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Image.c @@ -1808,7 +1808,7 @@ char *nxagentAllocateImageData(int width, int height, int depth, int *length, in data = NULL; - if ((data = xalloc(*length)) == NULL) + if ((data = malloc(*length)) == NULL) { #ifdef WARNING fprintf(stderr, "nxagentAllocateImageData: WARNING! Failed to allocate [%d] bytes of memory.\n", *length); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 6bd201d70..e85cdfdb6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -757,7 +757,7 @@ N/A } len = (max_keycode - min_keycode + 1) * mapWidth; - keymap = (KeySym *)xalloc(len * sizeof(KeySym)); + keymap = (KeySym *)malloc(len * sizeof(KeySym)); for(i = 0; i < len; ++i) keymap[i] = keymap64[i]; XFree(keymap64); @@ -1296,7 +1296,7 @@ int nxagentResetKeyboard(void) savedBellPercent, savedBellPitch, savedBellDuration); #endif - devBackup = xalloc(sizeof(DeviceIntRec)); + devBackup = malloc(sizeof(DeviceIntRec)); if (devBackup == NULL) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index d1923106d..b27a92102 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -204,7 +204,7 @@ InitSelections() #ifdef NXAGENT_CLIPBOARD { Selection *newsels; - newsels = (Selection *)xalloc(2 * sizeof(Selection)); + newsels = (Selection *)malloc(2 * sizeof(Selection)); if (!newsels) return; NumCurrentSelections += 2; @@ -750,7 +750,7 @@ ProcSetSelectionOwner(register ClientPtr client) Selection *newsels; if (i == 0) - newsels = (Selection *)xalloc(sizeof(Selection)); + newsels = (Selection *)malloc(sizeof(Selection)); else newsels = (Selection *)xrealloc(CurrentSelections, (NumCurrentSelections + 1) * sizeof(Selection)); @@ -1338,7 +1338,7 @@ InitClientPrivates(ClientPtr client) ppriv = (DevUnion *)(client + 1); else { - ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec)); + ppriv = (DevUnion *)malloc(totalClientSize - sizeof(ClientRec)); if (!ppriv) return 0; } diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c index d15df9513..4b0af0867 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c @@ -442,7 +442,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) } if (err == FontNameAlias) { if (resolved) free(resolved); - resolved = (char *) xalloc(resolvedlen + 1); + resolved = (char *) malloc(resolvedlen + 1); if (resolved) memmove(resolved, tmpname, resolvedlen + 1); } @@ -497,7 +497,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) c->haveSaved = TRUE; if (c->savedName) free(c->savedName); - c->savedName = (char *)xalloc(namelen + 1); + c->savedName = (char *)malloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); c->savedNameLen = namelen; @@ -638,10 +638,10 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length, if (length > XLFDMAXFONTNAMELEN) return BadAlloc; - if (!(c = (LFclosurePtr) xalloc(sizeof *c))) + if (!(c = (LFclosurePtr) malloc(sizeof *c))) return BadAlloc; c->fpe_list = (FontPathElementPtr *) - xalloc(sizeof(FontPathElementPtr) * num_fpes); + malloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { free(c); return BadAlloc; @@ -786,7 +786,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) c->savedNumFonts = numFonts; if (c->savedName) free(c->savedName); - c->savedName = (char *)xalloc(namelen + 1); + c->savedName = (char *)malloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); aliascount = 20; @@ -1086,7 +1086,7 @@ nxdoListFontsAndAliases(client, fss) } if (err == FontNameAlias) { if (resolved) free(resolved); - resolved = (char *) xalloc(resolvedlen + 1); + resolved = (char *) malloc(resolvedlen + 1); if (resolved) { memmove(resolved, tmpname, resolvedlen); @@ -1155,7 +1155,7 @@ nxdoListFontsAndAliases(client, fss) c->haveSaved = TRUE; if (c->savedName) free(c->savedName); - c->savedName = (char *)xalloc(namelen + 1); + c->savedName = (char *)malloc(namelen + 1); if (c->savedName) { memmove(c->savedName, name, namelen); @@ -1275,7 +1275,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) #ifdef FONTDEBUG char *f; - f = (char *)xalloc(lenfname + 1); + f = (char *)malloc(lenfname + 1); memmove(f, pfontname, lenfname); f[lenfname] = '\0'; ErrorF("OpenFont: fontname is \"%s\"\n", f); @@ -1312,16 +1312,16 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) return Success; } } - if (!(fss = (nxFsPtr) xalloc(sizeof(nxFs)))) + if (!(fss = (nxFsPtr) malloc(sizeof(nxFs)))) return BadAlloc; - if (!(c = (LFclosurePtr) xalloc(sizeof *c))) + if (!(c = (LFclosurePtr) malloc(sizeof *c))) { free(fss); return BadAlloc; } c->fpe_list = (FontPathElementPtr *) - xalloc(sizeof(FontPathElementPtr) * num_fpes); + malloc(sizeof(FontPathElementPtr) * num_fpes); if (!c->fpe_list) { free(c); free(fss); @@ -1351,7 +1351,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) c->slept = FALSE; c->savedName = 0; - oc = (OFclosurePtr) xalloc(sizeof(OFclosureRec)); + oc = (OFclosurePtr) malloc(sizeof(OFclosureRec)); if (!oc) { for (i = 0; i < c->num_fpes; i++) @@ -1361,7 +1361,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) free(fss); return BadAlloc; } - oc->fontname = (char *) xalloc(256);/* I don't want to deal with future reallocs errors */ + oc->fontname = (char *) malloc(256);/* I don't want to deal with future reallocs errors */ oc->origFontName = pfontname; oc->origFontNameLen = lenfname; if (!oc->fontname) { @@ -1378,7 +1378,7 @@ nxOpenFont(client, fid, flags, lenfname, pfontname) * while we're blocking, the request still appears atomic */ oc->fpe_list = (FontPathElementPtr *) - xalloc(sizeof(FontPathElementPtr) * num_fpes); + malloc(sizeof(FontPathElementPtr) * num_fpes); if (!oc->fpe_list) { free(oc->fontname); free(oc); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c index 53a5a8d68..430fb6baf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c @@ -101,7 +101,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns pScreen = screenInfo.screens[0]; nby = BitmapBytePad(cm->width) * (long)cm->height; - pbits = (char *)xalloc(nby); + pbits = (char *)malloc(nby); if (!pbits) return BadAlloc; /* zeroing the (pad) bits seems to help some ddx cursor handling */ diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c b/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c index bdc0bc316..15798bc77 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c @@ -87,7 +87,7 @@ miGlyphs (CARD8 op, } else { - nxagentGlyphsExtents = (BoxPtr) xalloc(sizeof(BoxRec)); + nxagentGlyphsExtents = (BoxPtr) malloc(sizeof(BoxRec)); miGlyphExtents (nlist, list, glyphs, &extents); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c b/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c index 1ef445af5..8db856d0a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c @@ -80,7 +80,7 @@ miTrapezoids (CARD8 op, } else { - nxagentTrapezoidExtents = (BoxPtr) xalloc(sizeof(BoxRec)); + nxagentTrapezoidExtents = (BoxPtr) malloc(sizeof(BoxRec)); miTrapezoidBounds (ntrap, traps, &bounds); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c index 44248bc1b..83133cb36 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXpicture.c @@ -87,7 +87,7 @@ PictureCreateDefaultFormats (ScreenPtr pScreen, int *nformatp) nxagentPictureCreateDefaultFormats(pScreen, formats, &nformats); - pFormats = (PictFormatPtr) xalloc (nformats * sizeof (PictFormatRec)); + pFormats = (PictFormatPtr) malloc (nformats * sizeof (PictFormatRec)); if (!pFormats) return 0; memset (pFormats, '\0', nformats * sizeof (PictFormatRec)); @@ -190,7 +190,7 @@ AllocatePicture (ScreenPtr pScreen) unsigned int size; int i; - pPicture = (PicturePtr) xalloc (ps->totalPictureSize); + pPicture = (PicturePtr) malloc (ps->totalPictureSize); if (!pPicture) return 0; ppriv = (DevUnion *)(pPicture + 1); @@ -281,7 +281,7 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error) } pPicture->id = pid; - pPicture->pSourcePict = (SourcePictPtr) xalloc(sizeof(PictSolidFill)); + pPicture->pSourcePict = (SourcePictPtr) malloc(sizeof(PictSolidFill)); if (!pPicture->pSourcePict) { *error = BadAlloc; free(pPicture); @@ -318,7 +318,7 @@ static PicturePtr createSourcePicture(void) picturePrivateCount * sizeof(DevUnion) + sizeof(nxagentPrivPictureRec); - pPicture = (PicturePtr) xalloc(totalPictureSize); + pPicture = (PicturePtr) malloc(totalPictureSize); if (pPicture != NULL) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 0ace2fbd2..4b4e059bd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -227,10 +227,10 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, { if (!pWin->optional && !MakeWindowOptional (pWin)) return(BadAlloc); - pProp = (PropertyPtr)xalloc(sizeof(PropertyRec)); + pProp = (PropertyPtr)malloc(sizeof(PropertyRec)); if (!pProp) return(BadAlloc); - data = (void *)xalloc(totalSize); + data = (void *)malloc(totalSize); if (!data && len) { free(pProp); @@ -290,7 +290,7 @@ ChangeWindowProperty(WindowPtr pWin, Atom property, Atom type, int format, } else if (mode == PropModePrepend) { - data = (void *)xalloc(sizeInBytes * (len + pProp->size)); + data = (void *)malloc(sizeInBytes * (len + pProp->size)); if (!data) return(BadAlloc); memmove(&((char *)data)[totalSize], (char *)pProp->data, diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index b89b835db..d14b47866 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -224,7 +224,7 @@ ProcRenderQueryPictFormats (ClientPtr client) ndepth * sizeof (xPictDepth) + nvisual * sizeof (xPictVisual) + numSubpixel * sizeof (CARD32)); - reply = (xRenderQueryPictFormatsReply *) xalloc (rlength); + reply = (xRenderQueryPictFormatsReply *) malloc (rlength); if (!reply) return BadAlloc; memset(reply, 0, rlength); @@ -712,7 +712,7 @@ ProcRenderTrapezoids (ClientPtr client) { if (pFormat != NULL) { - nxagentTrapezoidExtents = (BoxPtr) xalloc(sizeof(BoxRec)); + nxagentTrapezoidExtents = (BoxPtr) malloc(sizeof(BoxRec)); miTrapezoidBounds (ntraps, (xTrapezoid *) &stuff[1], nxagentTrapezoidExtents); } @@ -996,7 +996,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) return BadAlloc; } - elementsBase = xalloc(nlist * sizeof(XGlyphElt8)); + elementsBase = malloc(nlist * sizeof(XGlyphElt8)); if (!elementsBase) return BadAlloc; @@ -1098,7 +1098,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) * after the X requests. */ - nxagentGlyphsExtents = (BoxPtr) xalloc(sizeof(BoxRec)); + nxagentGlyphsExtents = (BoxPtr) malloc(sizeof(BoxRec)); miGlyphExtents(nlist, listsBase, glyphsBase, nxagentGlyphsExtents); @@ -1219,19 +1219,19 @@ ProcRenderCreateCursor (ClientPtr client) if ( stuff->x > width || stuff->y > height ) return (BadMatch); - argbbits = xalloc (width * height * sizeof (CARD32)); + argbbits = malloc (width * height * sizeof (CARD32)); if (!argbbits) return (BadAlloc); stride = BitmapBytePad(width); nbytes_mono = stride*height; - srcbits = (unsigned char *)xalloc(nbytes_mono); + srcbits = (unsigned char *)malloc(nbytes_mono); if (!srcbits) { free (argbbits); return (BadAlloc); } - mskbits = (unsigned char *)xalloc(nbytes_mono); + mskbits = (unsigned char *)malloc(nbytes_mono); if (!mskbits) { free(argbbits); @@ -1477,7 +1477,7 @@ ProcRenderCreateAnimCursor (ClientPtr client) if (client->req_len & 1) return BadLength; ncursor = (client->req_len - (SIZEOF(xRenderCreateAnimCursorReq) >> 2)) >> 1; - cursors = xalloc (ncursor * (sizeof (CursorPtr) + sizeof (CARD32))); + cursors = malloc (ncursor * (sizeof (CursorPtr) + sizeof (CARD32))); if (!cursors) return BadAlloc; deltas = (CARD32 *) (cursors + ncursor); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c index 4226a4435..eb48c5094 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXresource.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXresource.c @@ -257,7 +257,7 @@ AddResource(XID id, RESTYPE type, void * value) (rrec->hashsize < MAXHASHSIZE)) RebuildTable(client); head = &rrec->resources[Hash(client, id)]; - res = (ResourcePtr)xalloc(sizeof(ResourceRec)); + res = (ResourcePtr)malloc(sizeof(ResourceRec)); if (!res) { (*DeleteFuncs[type & TypeMask])(value, id); diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c index 08237440f..86b9e0d24 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c @@ -234,7 +234,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) length = nxagentImageLength(sw, sh, format, 0, depth); - if ((newdata = xalloc(length)) != NULL) + if ((newdata = malloc(length)) != NULL) { fbGetImage((DrawablePtr) pPixmap, sx, sy, sw, sh, format, AllPlanes, newdata); (*pGC->ops->PutImage)(dst, pGC, depth, dx, dy, sw, sh, 0, format, newdata); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c index 0eabf1262..931c564dc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c @@ -1251,7 +1251,7 @@ void nxagentSynchronizeShmPixmap(DrawablePtr pDrawable, int xPict, int yPict, nxagentFBTrap = 1; - if ((data = xalloc(length)) != NULL) + if ((data = malloc(length)) != NULL) { fbGetImage(nxagentVirtualDrawable(pDrawable), xPict, yPict, width, height, format, 0xffffffff, data); @@ -1373,7 +1373,7 @@ FIXME: If the pixmap has a different depth from the window, the length = nxagentImageLength(width, height, format, 0, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING fprintf(stderr, "nxagentPixmapOnShadowDisplay: WARNING! Failed to allocate memory for the operation.\n"); @@ -1535,7 +1535,7 @@ Bool nxagentFbOnShadowDisplay() length = nxagentImageLength(width, height, format, 0, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING fprintf(stderr, "nxagentFbOnShadowDisplay: WARNING! Failed to allocate memory for the operation.\n"); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c index 587e9a564..74c7587c7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Reconnect.c @@ -329,17 +329,17 @@ void nxagentInitReconnector(void) { nxagentReconnectTrap = 0; - reconnectLossyLevel[DISPLAY_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[SCREEN_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[FONT_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[PIXMAP_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[GC_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[CURSOR_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[COLORMAP_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[WINDOW_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[GLYPHSET_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[PICTFORMAT_STEP] = xalloc(sizeof(int)); - reconnectLossyLevel[PICTURE_STEP] = xalloc(sizeof(int)); + reconnectLossyLevel[DISPLAY_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[SCREEN_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[FONT_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[PIXMAP_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[GC_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[CURSOR_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[COLORMAP_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[WINDOW_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[GLYPHSET_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[PICTFORMAT_STEP] = malloc(sizeof(int)); + reconnectLossyLevel[PICTURE_STEP] = malloc(sizeof(int)); } void nxagentDisconnectSession(void) @@ -434,7 +434,7 @@ Bool nxagentReconnectSession(void) size = strlen(nxagentKeyboard); - if ((nxagentOldKeyboard = xalloc(size + 1)) != NULL) + if ((nxagentOldKeyboard = malloc(size + 1)) != NULL) { strncpy(nxagentOldKeyboard, nxagentKeyboard, size); diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index 36ce6a74f..4c9edb849 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -270,11 +270,11 @@ void nxagentRenderExtensionInit() int nxagentCursorSaveRenderInfo(ScreenPtr pScreen, CursorPtr pCursor) { - pCursor -> devPriv[pScreen -> myNum] = xalloc(sizeof(nxagentPrivCursor)); + pCursor -> devPriv[pScreen -> myNum] = malloc(sizeof(nxagentPrivCursor)); if (nxagentCursorPriv(pCursor, pScreen) == NULL) { - FatalError("xalloc failed"); + FatalError("malloc failed"); } nxagentCursorUsesRender(pCursor, pScreen) = 1; @@ -2249,7 +2249,7 @@ void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi, if (sizeImages > 0) { - normalizedImages = xalloc(sizeImages); + normalizedImages = malloc(sizeImages); if (normalizedImages != NULL) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c index 6947371ff..d5c6e71c9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Rootless.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Rootless.c @@ -305,7 +305,7 @@ void nxagentRootlessRestack(unsigned long children[], unsigned int nchildren) XID values[2]; Mask mask; - toplevel = xalloc(sizeof(WindowPtr) * nchildren); + toplevel = malloc(sizeof(WindowPtr) * nchildren); ntoplevel = 0; for(i = 0; i < nchildren; i++) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c index a4c6fc2db..152040fbd 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c @@ -1149,13 +1149,13 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, * Initialize the depths. */ - depths = (DepthPtr) xalloc(nxagentNumDepths * sizeof(DepthRec)); + depths = (DepthPtr) malloc(nxagentNumDepths * sizeof(DepthRec)); for (i = 0; i < nxagentNumDepths; i++) { depths[i].depth = nxagentDepths[i]; depths[i].numVids = 0; - depths[i].vids = (VisualID *) xalloc(MAXVISUALSPERDEPTH * sizeof(VisualID)); + depths[i].vids = (VisualID *) malloc(MAXVISUALSPERDEPTH * sizeof(VisualID)); } /* @@ -1170,7 +1170,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, numVisuals = 0; numDepths = nxagentNumDepths; - visuals = (VisualPtr) xalloc(nxagentNumVisuals * sizeof(VisualRec)); + visuals = (VisualPtr) malloc(nxagentNumVisuals * sizeof(VisualRec)); for (i = 0; i < nxagentNumVisuals; i++) { @@ -1250,7 +1250,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, depths[depthIndex].depth = nxagentVisuals[i].depth; depths[depthIndex].numVids = 0; - depths[depthIndex].vids = (VisualID *) xalloc(MAXVISUALSPERDEPTH * sizeof(VisualID)); + depths[depthIndex].vids = (VisualID *) malloc(MAXVISUALSPERDEPTH * sizeof(VisualID)); numDepths++; } @@ -1302,7 +1302,7 @@ Bool nxagentOpenScreen(int index, ScreenPtr pScreen, "[%d] bitsPerPixel [%d] sizeInBytes [%d]\n", rootDepth, bitsPerPixel, sizeInBytes); #endif - pFrameBufferBits = (char *) Xalloc(sizeInBytes); + pFrameBufferBits = (char *) malloc(sizeInBytes); if (!pFrameBufferBits) { @@ -3068,12 +3068,12 @@ int nxagentShadowPoll(PixmapPtr nxagentShadowPixmapPtr, GCPtr nxagentShadowGCPtr free(tBuffer); } - tBuffer = xalloc(length); + tBuffer = malloc(length); if (tBuffer == NULL) { #ifdef PANIC - fprintf(stderr, "nxagentShadowPoll: xalloc failed.\n"); + fprintf(stderr, "nxagentShadowPoll: malloc failed.\n"); #endif return -1; @@ -3166,7 +3166,7 @@ void nxagentShadowAdaptDepth(unsigned int width, unsigned int height, length = nxagentImageLength(width, height, ZPixmap, 0, nxagentShadowDepth); - cBuffer = xalloc(length); + cBuffer = malloc(length); icBuffer = cBuffer; pVisual = nxagentImageVisual((DrawablePtr) nxagentShadowPixmapPtr, nxagentShadowDepth); @@ -3423,7 +3423,7 @@ FIXME: The port information is not used at the moment and produces a #endif - local_buf = (char *) xalloc(strlen((char*)pszReturnData) + 100); + local_buf = (char *) malloc(strlen((char*)pszReturnData) + 100); if (local_buf) { @@ -3771,7 +3771,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) if (screeninfo) { free(screeninfo); } - if (!(screeninfo = xalloc(sizeof(XineramaScreenInfo)))) { + if (!(screeninfo = malloc(sizeof(XineramaScreenInfo)))) { return FALSE; } @@ -4157,7 +4157,7 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, nRects = RegionNumRects(&cleanRegion); size = nRects * sizeof(*pRects); - pRects = (XRectangle *) xalloc(size); + pRects = (XRectangle *) malloc(size); pBox = RegionRects(&cleanRegion); for (i = nRects; i-- > 0;) @@ -4303,7 +4303,7 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, nRects = RegionNumRects(clipRegion); size = nRects * sizeof(*pRects); - pRects = (XRectangle *) xalloc(size); + pRects = (XRectangle *) malloc(size); pBox = RegionRects(clipRegion); for (i = nRects; i-- > 0;) @@ -4511,10 +4511,10 @@ void nxagentShowPixmap(PixmapPtr pPixmap, int x, int y, int width, int height) length = nxagentImageLength(width, height, format, 0, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING - fprintf(stderr, "nxagentShowPixmap: xalloc failed.\n"); + fprintf(stderr, "nxagentShowPixmap: malloc failed.\n"); #endif return; @@ -4607,10 +4607,10 @@ void nxagentFbRestoreArea(PixmapPtr pPixmap, WindowPtr pWin, int xSrc, int ySrc, length = nxagentImageLength(width, height, format, 0, depth); - if ((data = xalloc(length)) == NULL) + if ((data = malloc(length)) == NULL) { #ifdef WARNING - fprintf(stderr, "nxagentFbRestoreArea: xalloc failed.\n"); + fprintf(stderr, "nxagentFbRestoreArea: malloc failed.\n"); #endif return; |