summaryrefslogtreecommitdiff
path: root/hw/xfree86/exa
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-09-30 02:03:45 +0000
committerAdam Jackson <ajax@nwnk.net>2005-09-30 02:03:45 +0000
commitaa74468aa59b95424cd0000179b8985b267d639b (patch)
tree5669f87bd8487d74a86f0559759c225926663639 /hw/xfree86/exa
parentc65fde5343719d3e9ebc76cc371c6f5f7948de8c (diff)
sparse cleanups. s/0/NULL/ and mark a few things static.
Diffstat (limited to 'hw/xfree86/exa')
-rw-r--r--hw/xfree86/exa/exa.c12
-rw-r--r--hw/xfree86/exa/exa_accel.c12
-rw-r--r--hw/xfree86/exa/exa_migration.c12
-rw-r--r--hw/xfree86/exa/exa_offscreen.c8
-rw-r--r--hw/xfree86/exa/exa_render.c6
-rw-r--r--hw/xfree86/exa/exaoffscreen.c8
-rw-r--r--hw/xfree86/exa/exapict.c6
7 files changed, 32 insertions, 32 deletions
diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c
index 53301c949..b7ba3b319 100644
--- a/hw/xfree86/exa/exa.c
+++ b/hw/xfree86/exa/exa.c
@@ -45,7 +45,7 @@
#define STRACE
#define TRACE
-int exaGeneration;
+static int exaGeneration;
int exaScreenPrivateIndex;
int exaPixmapPrivateIndex;
@@ -746,7 +746,7 @@ exaCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
return fbDoCopy (pSrcDrawable, pDstDrawable, pGC,
srcx, srcy, width, height,
- dstx, dsty, exaCopyNtoN, 0, 0);
+ dstx, dsty, exaCopyNtoN, 0, NULL);
}
static void
@@ -963,7 +963,7 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
ExaCheckImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppciInit, pglyphBase);
return;
}
- glyph = 0;
+ glyph = NULL;
fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
switch (dstBpp) {
case 8: glyph = fbGlyph8; break;
@@ -1096,7 +1096,7 @@ exaValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
pGC->ops = (GCOps *) &exaAsyncPixmapGCOps;
}
-GCFuncs exaGCFuncs = {
+static GCFuncs exaGCFuncs = {
exaValidateGC,
miChangeGC,
miCopyGC,
@@ -1149,8 +1149,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
#endif
fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
- 0,
- &rgnDst, dx, dy, exaCopyNtoN, 0, 0);
+ NULL,
+ &rgnDst, dx, dy, exaCopyNtoN, 0, NULL);
REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
}
diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c
index 53301c949..b7ba3b319 100644
--- a/hw/xfree86/exa/exa_accel.c
+++ b/hw/xfree86/exa/exa_accel.c
@@ -45,7 +45,7 @@
#define STRACE
#define TRACE
-int exaGeneration;
+static int exaGeneration;
int exaScreenPrivateIndex;
int exaPixmapPrivateIndex;
@@ -746,7 +746,7 @@ exaCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
return fbDoCopy (pSrcDrawable, pDstDrawable, pGC,
srcx, srcy, width, height,
- dstx, dsty, exaCopyNtoN, 0, 0);
+ dstx, dsty, exaCopyNtoN, 0, NULL);
}
static void
@@ -963,7 +963,7 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
ExaCheckImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppciInit, pglyphBase);
return;
}
- glyph = 0;
+ glyph = NULL;
fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
switch (dstBpp) {
case 8: glyph = fbGlyph8; break;
@@ -1096,7 +1096,7 @@ exaValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
pGC->ops = (GCOps *) &exaAsyncPixmapGCOps;
}
-GCFuncs exaGCFuncs = {
+static GCFuncs exaGCFuncs = {
exaValidateGC,
miChangeGC,
miCopyGC,
@@ -1149,8 +1149,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
#endif
fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
- 0,
- &rgnDst, dx, dy, exaCopyNtoN, 0, 0);
+ NULL,
+ &rgnDst, dx, dy, exaCopyNtoN, 0, NULL);
REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
}
diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c
index 53301c949..b7ba3b319 100644
--- a/hw/xfree86/exa/exa_migration.c
+++ b/hw/xfree86/exa/exa_migration.c
@@ -45,7 +45,7 @@
#define STRACE
#define TRACE
-int exaGeneration;
+static int exaGeneration;
int exaScreenPrivateIndex;
int exaPixmapPrivateIndex;
@@ -746,7 +746,7 @@ exaCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
return fbDoCopy (pSrcDrawable, pDstDrawable, pGC,
srcx, srcy, width, height,
- dstx, dsty, exaCopyNtoN, 0, 0);
+ dstx, dsty, exaCopyNtoN, 0, NULL);
}
static void
@@ -963,7 +963,7 @@ exaImageGlyphBlt (DrawablePtr pDrawable,
ExaCheckImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppciInit, pglyphBase);
return;
}
- glyph = 0;
+ glyph = NULL;
fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
switch (dstBpp) {
case 8: glyph = fbGlyph8; break;
@@ -1096,7 +1096,7 @@ exaValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
pGC->ops = (GCOps *) &exaAsyncPixmapGCOps;
}
-GCFuncs exaGCFuncs = {
+static GCFuncs exaGCFuncs = {
exaValidateGC,
miChangeGC,
miCopyGC,
@@ -1149,8 +1149,8 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
#endif
fbCopyRegion (&pPixmap->drawable, &pPixmap->drawable,
- 0,
- &rgnDst, dx, dy, exaCopyNtoN, 0, 0);
+ NULL,
+ &rgnDst, dx, dy, exaCopyNtoN, 0, NULL);
REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
}
diff --git a/hw/xfree86/exa/exa_offscreen.c b/hw/xfree86/exa/exa_offscreen.c
index 246241ce3..9284dbd6a 100644
--- a/hw/xfree86/exa/exa_offscreen.c
+++ b/hw/xfree86/exa/exa_offscreen.c
@@ -195,7 +195,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
new_area->offset = area->offset + real_size;
new_area->size = area->size - real_size;
new_area->state = ExaOffscreenAvail;
- new_area->save = 0;
+ new_area->save = NULL;
new_area->score = 0;
new_area->next = area->next;
area->next = new_area;
@@ -299,14 +299,14 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
ExaOffscreenValidate (pScreen);
area->state = ExaOffscreenAvail;
- area->save = 0;
+ area->save = NULL;
area->offset = area->save_offset;
area->score = 0;
/*
* Find previous area
*/
if (area == pExaScr->info->card.offScreenAreas)
- prev = 0;
+ prev = NULL;
else
for (prev = pExaScr->info->card.offScreenAreas; prev; prev = prev->next)
if (prev->next == area)
@@ -367,7 +367,7 @@ exaOffscreenInit (ScreenPtr pScreen)
area->state = ExaOffscreenAvail;
area->offset = pExaScr->info->card.offScreenBase;
area->size = pExaScr->info->card.memorySize - area->offset;
- area->save = 0;
+ area->save = NULL;
area->next = NULL;
area->score = 0;
diff --git a/hw/xfree86/exa/exa_render.c b/hw/xfree86/exa/exa_render.c
index 24bbe48a9..d57a2215e 100644
--- a/hw/xfree86/exa/exa_render.c
+++ b/hw/xfree86/exa/exa_render.c
@@ -507,10 +507,10 @@ exaComposite(CARD8 op,
return;
- exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, 0,
+ exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL,
REGION_RECTS(&region), REGION_NUM_RECTS(&region),
xSrc - xDst, ySrc - yDst,
- FALSE, FALSE, 0, 0);
+ FALSE, FALSE, 0, NULL);
return;
}
}
@@ -724,7 +724,7 @@ exaGlyphs (CARD8 op,
{
CompositePicture (PictOpAdd,
pPicture,
- None,
+ NULL,
pMask,
0, 0,
0, 0,
diff --git a/hw/xfree86/exa/exaoffscreen.c b/hw/xfree86/exa/exaoffscreen.c
index 246241ce3..9284dbd6a 100644
--- a/hw/xfree86/exa/exaoffscreen.c
+++ b/hw/xfree86/exa/exaoffscreen.c
@@ -195,7 +195,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align,
new_area->offset = area->offset + real_size;
new_area->size = area->size - real_size;
new_area->state = ExaOffscreenAvail;
- new_area->save = 0;
+ new_area->save = NULL;
new_area->score = 0;
new_area->next = area->next;
area->next = new_area;
@@ -299,14 +299,14 @@ exaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area)
ExaOffscreenValidate (pScreen);
area->state = ExaOffscreenAvail;
- area->save = 0;
+ area->save = NULL;
area->offset = area->save_offset;
area->score = 0;
/*
* Find previous area
*/
if (area == pExaScr->info->card.offScreenAreas)
- prev = 0;
+ prev = NULL;
else
for (prev = pExaScr->info->card.offScreenAreas; prev; prev = prev->next)
if (prev->next == area)
@@ -367,7 +367,7 @@ exaOffscreenInit (ScreenPtr pScreen)
area->state = ExaOffscreenAvail;
area->offset = pExaScr->info->card.offScreenBase;
area->size = pExaScr->info->card.memorySize - area->offset;
- area->save = 0;
+ area->save = NULL;
area->next = NULL;
area->score = 0;
diff --git a/hw/xfree86/exa/exapict.c b/hw/xfree86/exa/exapict.c
index 24bbe48a9..d57a2215e 100644
--- a/hw/xfree86/exa/exapict.c
+++ b/hw/xfree86/exa/exapict.c
@@ -507,10 +507,10 @@ exaComposite(CARD8 op,
return;
- exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, 0,
+ exaCopyNtoN (pSrc->pDrawable, pDst->pDrawable, NULL,
REGION_RECTS(&region), REGION_NUM_RECTS(&region),
xSrc - xDst, ySrc - yDst,
- FALSE, FALSE, 0, 0);
+ FALSE, FALSE, 0, NULL);
return;
}
}
@@ -724,7 +724,7 @@ exaGlyphs (CARD8 op,
{
CompositePicture (PictOpAdd,
pPicture,
- None,
+ NULL,
pMask,
0, 0,
0, 0,
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-13 10:23:59 +0000