amd64: FP: always use enough to fit AVX state and align to 64 bytes

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

diff --git a/sys/src/libdraw/subfont.c b/sys/src/libdraw/subfont.c
old mode 100755 (executable)
new mode 100644 (file)
index 61838b0..60e1288
--- a/sys/src/libdraw/subfont.c
+++ b/sys/src/libdraw/subfont.c
@@ -10,8 +10,8 @@ allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i
        assert(height != 0 /* allocsubfont */);
 
        f = malloc(sizeof(Subfont));
-       if(f == 0)
-               return 0;
+       if(f == nil)
+               return nil;
        f->n = n;
        f->height = height;
        f->ascent = ascent;
@@ -20,9 +20,12 @@ allocsubfont(char *name, int n, int height, int ascent, Fontchar *info, Image *i
        f->ref = 1;
        if(name){
                f->name = strdup(name);
-               if(lookupsubfont(i->display, name) == 0)
-                       installsubfont(name, f);
+               if(f->name == nil){
+                       free(f);
+                       return nil;
+               }
+               installsubfont(name, f);
        }else
-               f->name = 0;
+               f->name = nil;
        return f;
 }