frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply the xserver patch from vektor for bug #4208: Use NULL for pointers 

instead of 0.
This commit is contained in:
Eric Anholt 2005-08-30 03:01:38 +00:00
parent 20813d3af0
commit e321f9e7ff
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fb/fbbltone.c
View File

@ -232,11 +232,11 @@ fbBltOne (FbStip *src,
/* /*
* Get pointer to stipple mask array for this depth * Get pointer to stipple mask array for this depth
*/ */
fbBits = 0; /* unused */ fbBits = NULL; /* unused */
if (pixelsPerDst <= 8) if (pixelsPerDst <= 8)
fbBits = fbStippleTable[pixelsPerDst]; fbBits = fbStippleTable[pixelsPerDst];
#ifndef FBNOPIXADDR #ifndef FBNOPIXADDR
fbLane = 0; fbLane = NULL;
if (transparent && fgand == 0 && dstBpp >= 8) if (transparent && fgand == 0 && dstBpp >= 8)
fbLane = fbLaneTable[dstBpp]; fbLane = fbLaneTable[dstBpp];
#endif #endif

38
fb/fbcompose.c
View File

@ -1,5 +1,5 @@
/* /*
* $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.10 2005/07/01 10:05:42 lars Exp $ * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.19 2005/08/12 18:50:33 sandmann Exp $
* $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
* *
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -558,7 +558,7 @@ static fetchProc fetchProcForPicture (PicturePtr pict)
case PICT_a1: return fbFetch_a1; case PICT_a1: return fbFetch_a1;
case PICT_g1: return fbFetch_g1; case PICT_g1: return fbFetch_g1;
default: default:
return 0; return NULL;
} }
} }
@ -986,7 +986,7 @@ static fetchPixelProc fetchPixelProcForPicture (PicturePtr pict)
case PICT_a1: return fbFetchPixel_a1; case PICT_a1: return fbFetchPixel_a1;
case PICT_g1: return fbFetchPixel_g1; case PICT_g1: return fbFetchPixel_g1;
default: default:
return 0; return NULL;
} }
} }
@ -1422,7 +1422,7 @@ static storeProc storeProcForPicture (PicturePtr pict)
case PICT_a1: return fbStore_a1; case PICT_a1: return fbStore_a1;
case PICT_g1: return fbStore_g1; case PICT_g1: return fbStore_g1;
default: default:
return 0; return NULL;
} }
} }
@ -1926,7 +1926,7 @@ fbCombineConjointXorU (CARD32 *dest, const CARD32 *src, int width)
static CombineFuncU fbCombineFuncU[] = { static CombineFuncU fbCombineFuncU[] = {
fbCombineClear, fbCombineClear,
fbCombineSrcU, fbCombineSrcU,
0, /* CombineDst */ NULL, /* CombineDst */
fbCombineOverU, fbCombineOverU,
fbCombineOverReverseU, fbCombineOverReverseU,
fbCombineInU, fbCombineInU,
@ -1938,11 +1938,11 @@ static CombineFuncU fbCombineFuncU[] = {
fbCombineXorU, fbCombineXorU,
fbCombineAddU, fbCombineAddU,
fbCombineSaturateU, fbCombineSaturateU,
0, NULL,
0, NULL,
fbCombineClear, fbCombineClear,
fbCombineSrcU, fbCombineSrcU,
0, /* CombineDst */ NULL, /* CombineDst */
fbCombineDisjointOverU, fbCombineDisjointOverU,
fbCombineSaturateU, /* DisjointOverReverse */ fbCombineSaturateU, /* DisjointOverReverse */
fbCombineDisjointInU, fbCombineDisjointInU,
@ -1952,13 +1952,13 @@ static CombineFuncU fbCombineFuncU[] = {
fbCombineDisjointAtopU, fbCombineDisjointAtopU,
fbCombineDisjointAtopReverseU, fbCombineDisjointAtopReverseU,
fbCombineDisjointXorU, fbCombineDisjointXorU,
0, NULL,
0, NULL,
0, NULL,
0, NULL,
fbCombineClear, fbCombineClear,
fbCombineSrcU, fbCombineSrcU,
0, /* CombineDst */ NULL, /* CombineDst */
fbCombineConjointOverU, fbCombineConjointOverU,
fbCombineConjointOverReverseU, fbCombineConjointOverReverseU,
fbCombineConjointInU, fbCombineConjointInU,
@ -3319,10 +3319,10 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
CARD32 *dest_buffer = src_buffer + data->width; CARD32 *dest_buffer = src_buffer + data->width;
int i; int i;
scanStoreProc store; scanStoreProc store;
scanFetchProc fetchSrc = 0, fetchMask = 0, fetchDest = 0; scanFetchProc fetchSrc = NULL, fetchMask = NULL, fetchDest = NULL;
if (data->op == PictOpClear) if (data->op == PictOpClear)
fetchSrc = 0; fetchSrc = NULL;
else if (!data->src->pDrawable) { else if (!data->src->pDrawable) {
if (data->src->pSourcePict) if (data->src->pSourcePict)
fetchSrc = fbFetchSourcePict; fetchSrc = fbFetchSourcePict;
@ -3350,7 +3350,7 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
else else
fetchMask = fbFetchTransformed; fetchMask = fbFetchTransformed;
} else { } else {
fetchMask = 0; fetchMask = NULL;
} }
if (data->dest->alphaMap) { if (data->dest->alphaMap) {
@ -3361,7 +3361,7 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
store = fbStore; store = fbStore;
} }
if (data->op == PictOpClear || data->op == PictOpSrc) if (data->op == PictOpClear || data->op == PictOpSrc)
fetchDest = 0; fetchDest = NULL;
if (fetchSrc && fetchMask && data->mask && data->mask->componentAlpha && PICT_FORMAT_RGB(data->mask->format)) { if (fetchSrc && fetchMask && data->mask && data->mask->componentAlpha && PICT_FORMAT_RGB(data->mask->format)) {
CARD32 *mask_buffer = dest_buffer + data->width; CARD32 *mask_buffer = dest_buffer + data->width;
@ -3397,8 +3397,8 @@ fbCompositeRect (const FbComposeData *data, CARD32 *scanline_buffer)
fetchMask(data->mask, data->xMask, data->yMask, data->width, dest_buffer); fetchMask(data->mask, data->xMask, data->yMask, data->width, dest_buffer);
composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width); composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width);
} }
fetchSrc = 0; fetchSrc = NULL;
fetchMask = 0; fetchMask = NULL;
} }
for (i = 0; i < data->height; ++i) for (i = 0; i < data->height; ++i)

2
fb/fbpict.c
View File

@ -841,7 +841,7 @@ fbComposite (CARD8 op,
RegionRec region; RegionRec region;
int n; int n;
BoxPtr pbox; BoxPtr pbox;
CompositeFunc func = 0; CompositeFunc func = NULL;
Bool srcRepeat = pSrc->pDrawable && pSrc->repeat == RepeatNormal; Bool srcRepeat = pSrc->pDrawable && pSrc->repeat == RepeatNormal;
Bool maskRepeat = FALSE; Bool maskRepeat = FALSE;
Bool srcAlphaMap = pSrc->alphaMap != 0; Bool srcAlphaMap = pSrc->alphaMap != 0;