Improve the posix preprocessor.

[plan9front.git] / sys / src / libdraw / creadimage.c

diff --git a/sys/src/libdraw/creadimage.c b/sys/src/libdraw/creadimage.c
index b9d7e4ed8d6be2b6677844ff0272cebdef78c421..67fd59ba4f9b7274bcfe576d54b84a2aef95a038 100644 (file)
--- a/sys/src/libdraw/creadimage.c
+++ b/sys/src/libdraw/creadimage.c
@@ -54,11 +54,10 @@ creadimage(Display *d, int fd, int dolock)
                return nil;
        }
 
-       if(d){
+       if(d != nil){
                if(dolock)
                        lockdisplay(d);
                i = allocimage(d, r, chan, 0, 0);
-               setmalloctag(i, getcallerpc(&d));
                if(dolock)
                        unlockdisplay(d);
                if(i == nil)
@@ -68,6 +67,7 @@ creadimage(Display *d, int fd, int dolock)
                if(i == nil)
                        return nil;
        }
+       setmalloctag(i, getcallerpc(&d));
        ncblock = _compblocksize(r, chantodepth(chan));
        buf = malloc(ncblock);
        if(buf == nil)
@@ -97,7 +97,7 @@ creadimage(Display *d, int fd, int dolock)
                }
                if(readn(fd, buf, nb)!=nb)
                        goto Errout;
-               if(d){
+               if(d != nil){
                        if(dolock)
                                lockdisplay(d);
                        a = bufimage(i->display, 21+nb);