Merge remote branch 'whot/for-keith'

2 files changed, 6 insertions, 15 deletions

diff --git a/render/miindex.c b/render/miindex.c
index 5e2e06c35..4603136a4 100644
--- a/render/miindex.c
+++ b/render/miindex.c
@@ -322,16 +322,10 @@ void
 miCloseIndexed (ScreenPtr	pScreen,
 		PictFormatPtr	pFormat)
 {
-    if (pFormat->index.devPrivate)
-    {
-	free(pFormat->index.devPrivate);
-	pFormat->index.devPrivate = 0;
-    }
-    if (pFormat->index.pValues)
-    {
-	free(pFormat->index.pValues);
-	pFormat->index.pValues = 0;
-    }
+    free(pFormat->index.devPrivate);
+    pFormat->index.devPrivate = NULL;
+    free(pFormat->index.pValues);
+    pFormat->index.pValues = NULL;
 }
 
 void
diff --git a/render/picture.c b/render/picture.c
index 7fda6b93a..896eaa7be 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -1391,11 +1391,8 @@ SetPictureTransform (PicturePtr	    pPicture,
     }
     else
     {
-	if (pPicture->transform)
-	{
-	    free(pPicture->transform);
-	    pPicture->transform = 0;
-	}
+	free(pPicture->transform);
+	pPicture->transform = NULL;
     }
     pPicture->serialNumber |= GC_CHANGE_SERIAL_BIT;