fix 2 uninitialized variables and bin == NULL check

diff --git a/drw.c b/drw.c
index 15797ceb67ae85edf6140eb7f60dae9f395c90c2..be30400b38316d865fd22311a91b99ccd3fb7071 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -228,7 +228,7 @@ int
 drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) {
        char buf[1024];
        int tx, ty, th;
-       unsigned int ew;
+       unsigned int ew = 0;
        Colormap cmap;
        Visual *vis;
        XftDraw *d;

diff --git a/sent.c b/sent.c
index 5c725974606e2f6d8e5e30116a5c0c558b745dab..51f6eedda01590b13f33f22ed16ae5525859e499 100644 (file)
--- a/sent.c
+++ b/sent.c
@@ -162,23 +162,25 @@ filter(int fd, const char *cmd)
 Image *ffopen(char *filename)
 {
        unsigned char hdr[16];
-       char *bin;
+       char *bin = NULL;
        regex_t regex;
        Image *img;
        size_t i;
        int tmpfd, fd;
 
-       for (bin = NULL, i = 0; i < LEN(filters); i++) {
+       for (i = 0; i < LEN(filters); i++) {
                if (regcomp(&regex, filters[i].regex,
                            REG_NOSUB | REG_EXTENDED | REG_ICASE))
                        continue;
                if (!regexec(&regex, filename, 0, NULL, 0)) {
-                       if (!(bin = filters[i].bin))
-                               return NULL;
+                       bin = filters[i].bin
                        break;
                }
        }
 
+       if (!bin)
+               return NULL;
+
        if ((fd = open(filename, O_RDONLY)) < 0) {
                eprintf("Unable to open file %s:", filename);
                return NULL;
@@ -355,7 +357,7 @@ void ffdraw(Image *img)
 void getfontsize(Slide *s, unsigned int *width, unsigned int *height)
 {
        int i, j;
-       unsigned int curw, imax;
+       unsigned int curw, new_max;
        float lfac = linespacing * (s->linecount - 1) + 1;
 
        /* fit height */
@@ -369,13 +371,12 @@ void getfontsize(Slide *s, unsigned int *width, unsigned int *height)
        *width = 0;
        for (i = 0; i < s->linecount; i++) {
                curw = drw_fontset_getwidth(d, s->lines[i]);
-               if (curw >= *width)
-                       imax = i;
+               newmax = (curw >= *width);
                while (j > 0 && curw > xw.uw) {
                        drw_setfontset(d, fonts[--j]);
                        curw = drw_fontset_getwidth(d, s->lines[i]);
                }
-               if (imax == i)
+               if (newmax)
                        *width = curw;
        }
        *height = fonts[j]->h * lfac;