foo

[dmenu.git] / draw.c

diff --git a/draw.c b/draw.c
index d0f21cd..0459392 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -10,8 +10,7 @@
 /* static */
 
 static unsigned int
 /* static */
 
 static unsigned int

-textnw(const char *text, unsigned int len)
-{
+textnw(const char *text, unsigned int len) {

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -24,8 +23,7 @@ textnw(const char *text, unsigned int len)
 /* extern */
 
 void
 /* extern */
 
 void

-drawtext(const char *text, unsigned long col[ColLast])
-{
+drawtext(const char *text, unsigned long col[ColLast]) {

        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;
        int x, y, w, h;
        static char buf[256];
        unsigned int len, olen;


@@ -78,18 +76,16 @@ drawtext(const char *text, unsigned long col[ColLast])
 }
 
 unsigned long
 }
 
 unsigned long

-getcolor(const char *colstr)
-{
+getcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        Colormap cmap = DefaultColormap(dpy, screen);

-       XColor color;
+       XColor color = {0};

 
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
        return color.pixel;
 }
 
 void
 
        XAllocNamedColor(dpy, cmap, colstr, &color, &color);
        return color.pixel;
 }
 
 void

-setfont(const char *fontstr)
-{
+setfont(const char *fontstr) {

        char **missing, *def;
        int i, n;
 
        char **missing, *def;
        int i, n;
 


@@ -137,7 +133,6 @@ setfont(const char *fontstr)
 }
 
 unsigned int
 }
 
 unsigned int

-textw(const char *text)
-{
+textw(const char *text) {

        return textnw(text, strlen(text)) + dc.font.height;
 }
        return textnw(text, strlen(text)) + dc.font.height;
 }