Revert and re-apply badnull patch

Revert previous patch generated by badnull.cocci script, and apply the new one.
The main difference is that assert and assert-like functions are not touched
anymore.




SVN revision: 51650

1 files changed, 1 insertions, 1 deletions

diff --git a/src/draw.c b/src/draw.c
index 355e246..85a22d0 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -168,7 +168,7 @@ bevel_pixmap(Pixmap p, int w, int h, Imlib_Border * bord, unsigned char up)
         real_depth = Xdepth;
     }
     ximg = XGetImage(Xdisplay, p, 0, 0, w, h, -1, ZPixmap);
-    if (ximg == NULL) {
+    if (!ximg) {
         return;
     }
     /* Determine bitshift and bitmask values */