xserver/fb fbbltone.c, 1.15, 1.16 fbcompose.c, 1.36, 1.37 fbpict.c, 1.42, 1.43

[Billy Biggs]

Committed by: vektor

Update of /cvs/xserver/xserver/fb
In directory gabe:/tmp/cvs-serv22723/fb

Modified Files:
	fbbltone.c fbcompose.c fbpict.c 
Log Message:
	Some fixes for warnings from sparse (Part of bug #4208,
	Kjartan Maraas)

	* fb/fbbltone.c (fbBltOne):
	* fb/fbcompose.c (fetchProcForPicture),
	(fetchPixelProcForPicture), (storeProcForPicture),
	(fbCompositeRect):
	* fb/fbpict.c (fbComposite):   Use NULL not 0.



Index: fbbltone.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbbltone.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fbbltone.c	2 Mar 2005 15:30:03 -0000	1.15
+++ fbbltone.c	28 Aug 2005 02:36:40 -0000	1.16
@@ -231,11 +231,11 @@
     /*
      * Get pointer to stipple mask array for this depth
      */
-    fbBits = 0;	/* unused */
+    fbBits = NULL;	/* unused */
     if (pixelsPerDst <= 8)
 	fbBits = fbStippleTable[pixelsPerDst];
 #ifndef FBNOPIXADDR
-    fbLane = 0;
+    fbLane = NULL;
     if (transparent && fgand == 0 && dstBpp >= 8)
 	fbLane = fbLaneTable[dstBpp];
 #endif

Index: fbcompose.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbcompose.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- fbcompose.c	19 Aug 2005 01:43:29 -0000	1.36
+++ fbcompose.c	28 Aug 2005 02:36:40 -0000	1.37
@@ -554,7 +554,7 @@
     case PICT_a1: return  fbFetch_a1;
     case PICT_g1: return  fbFetch_g1;
     default:
-        return 0;
+        return NULL;
     }
 }
 
@@ -982,7 +982,7 @@
     case PICT_a1: return  fbFetchPixel_a1;
     case PICT_g1: return  fbFetchPixel_g1;
     default:
-        return 0;
+        return NULL;
     }
 }
 
@@ -1418,7 +1418,7 @@
     case PICT_a1: return  fbStore_a1;
     case PICT_g1: return  fbStore_g1;
     default:
-        return 0;
+        return NULL;
     }
 }
 
@@ -1922,7 +1922,7 @@
 static CombineFuncU fbCombineFuncU[] = {
     fbCombineClear,
     fbCombineSrcU,
-    0, /* CombineDst */
+    NULL, /* CombineDst */
     fbCombineOverU,
     fbCombineOverReverseU,
     fbCombineInU,
@@ -1934,11 +1934,11 @@
     fbCombineXorU,
     fbCombineAddU,
     fbCombineSaturateU,
-    0,
-    0,
+    NULL,
+    NULL,
     fbCombineClear,
     fbCombineSrcU,
-    0, /* CombineDst */
+    NULL, /* CombineDst */
     fbCombineDisjointOverU,
     fbCombineSaturateU, /* DisjointOverReverse */
     fbCombineDisjointInU,
@@ -1948,13 +1948,13 @@
     fbCombineDisjointAtopU,
     fbCombineDisjointAtopReverseU,
     fbCombineDisjointXorU,
-    0,
-    0,
-    0,
-    0,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     fbCombineClear,
     fbCombineSrcU,
-    0, /* CombineDst */
+    NULL, /* CombineDst */
     fbCombineConjointOverU,
     fbCombineConjointOverReverseU,
     fbCombineConjointInU,
@@ -2543,7 +2543,7 @@
 static CombineFuncC fbCombineFuncC[] = {
     fbCombineClearC,
     fbCombineSrcC,
-    0, /* Dest */
+    NULL, /* Dest */
     fbCombineOverC,
     fbCombineOverReverseC,
     fbCombineInC,
@@ -2555,11 +2555,11 @@
     fbCombineXorC,
     fbCombineAddC,
     fbCombineSaturateC,
-    0,
-    0,
+    NULL,
+    NULL,
     fbCombineClearC,	    /* 0x10 */
     fbCombineSrcC,
-    0, /* Dest */
+    NULL, /* Dest */
     fbCombineDisjointOverC,
     fbCombineSaturateC, /* DisjointOverReverse */
     fbCombineDisjointInC,
@@ -2569,13 +2569,13 @@
     fbCombineDisjointAtopC,
     fbCombineDisjointAtopReverseC,
     fbCombineDisjointXorC,  /* 0x1b */
-    0,
-    0,
-    0,
-    0,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
     fbCombineClearC,
     fbCombineSrcC,
-    0, /* Dest */
+    NULL, /* Dest */
     fbCombineConjointOverC,
     fbCombineConjointOverReverseC,
     fbCombineConjointInC,
@@ -3396,10 +3396,10 @@
     CARD32 *dest_buffer = src_buffer + data->width;
     int i;
     scanStoreProc store;
-    scanFetchProc fetchSrc = 0, fetchMask = 0, fetchDest = 0;
+    scanFetchProc fetchSrc = NULL, fetchMask = NULL, fetchDest = NULL;
 
     if (data->op == PictOpClear)
-        fetchSrc = 0;
+        fetchSrc = NULL;
     else if (!data->src->pDrawable) {
         if (data->src->pSourcePict)
             fetchSrc = fbFetchSourcePict;
@@ -3427,7 +3427,7 @@
         else
             fetchMask = fbFetchTransformed;
     } else {
-        fetchMask = 0;
+        fetchMask = NULL;
     }
 
     if (data->dest->alphaMap) {
@@ -3438,7 +3438,7 @@
         store = fbStore;
     }
     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)) {
         CARD32 *mask_buffer = dest_buffer + data->width;
@@ -3474,8 +3474,8 @@
                 fetchMask(data->mask, data->xMask, data->yMask, data->width, dest_buffer);
                 composeFunctions.combineMaskU(src_buffer, dest_buffer, data->width);
             }
-            fetchSrc = 0;
-            fetchMask = 0;
+            fetchSrc = NULL;
+            fetchMask = NULL;
         }
 
         for (i = 0; i < data->height; ++i) {

Index: fbpict.c
===================================================================
RCS file: /cvs/xserver/xserver/fb/fbpict.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- fbpict.c	22 Aug 2005 03:53:20 -0000	1.42
+++ fbpict.c	28 Aug 2005 02:36:40 -0000	1.43
@@ -1360,7 +1360,7 @@
     RegionRec	    region;
     int		    n;
     BoxPtr	    pbox;
-    CompositeFunc   func = 0;
+    CompositeFunc   func = NULL;
     Bool	    srcRepeat = pSrc->pDrawable && pSrc->repeat == RepeatNormal;
     Bool	    maskRepeat = FALSE;
     Bool	    srcTransform = pSrc->transform != 0;