enforcing using imcomplete fonsets anyways

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index 14bb801..56a1beb 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -35,8 +35,8 @@ drawtext(const char *text, unsigned long col[ColLast]) {
                return;
        w = 0;
        olen = len = strlen(text);
                return;
        w = 0;
        olen = len = strlen(text);

-       if(len >= sizeof(buf))
-               len = sizeof(buf) - 1;
+       if(len >= sizeof buf)
+               len = sizeof buf - 1;

        memcpy(buf, text, len);
        buf[len] = 0;
        h = dc.font.ascent + dc.font.descent;
        memcpy(buf, text, len);
        buf[len] = 0;
        h = dc.font.ascent + dc.font.descent;


@@ -88,13 +88,8 @@ setfont(const char *fontstr) {
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);

-       if(missing) {
+       if(missing)

                XFreeStringList(missing);
                XFreeStringList(missing);

-               if(dc.font.set) {
-                       XFreeFontSet(dpy, dc.font.set);
-                       dc.font.set = NULL;
-               }
-       }

        if(dc.font.set) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
        if(dc.font.set) {
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;