it* My version of sent Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/sent-sdk.git URL:git://git.codevoid.de/sent-sdk.git codevoid.de 70 1Log /git/sent-sdk/log.gph codevoid.de 70 1Files /git/sent-sdk/files.gph codevoid.de 70 1Refs /git/sent-sdk/refs.gph codevoid.de 70 1README /git/sent-sdk/file/README.md.gph codevoid.de 70 1LICENSE /git/sent-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 008ff1b88b3e9cdd13e82d0ec4fb573c977f6a3d /git/sent-sdk/commit/008ff1b88b3e9cdd13e82d0ec4fb573c977f6a3d.gph codevoid.de 70 1parent edb46305647d909199a860b6b0812595742f6fe4 /git/sent-sdk/commit/edb46305647d909199a860b6b0812595742f6fe4.gph codevoid.de 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de codevoid.de 70 iDate: Wed, 9 Dec 2015 00:50:05 +0100 Err codevoid.de 70 i Err codevoid.de 70 ifix 2 uninitialized variables and bin == NULL check Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M drw.c | 2 +- Err codevoid.de 70 i M sent.c | 17 +++++++++-------- Err codevoid.de 70 i Err codevoid.de 70 i2 files changed, 10 insertions(+), 9 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/drw.c b/drw.c /git/sent-sdk/file/drw.c.gph codevoid.de 70 it@@ -228,7 +228,7 @@ int Err codevoid.de 70 i drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) { Err codevoid.de 70 i char buf[1024]; Err codevoid.de 70 i int tx, ty, th; Err codevoid.de 70 i- unsigned int ew; Err codevoid.de 70 i+ unsigned int ew = 0; Err codevoid.de 70 i Colormap cmap; Err codevoid.de 70 i Visual *vis; Err codevoid.de 70 i XftDraw *d; Err codevoid.de 70 1diff --git a/sent.c b/sent.c /git/sent-sdk/file/sent.c.gph codevoid.de 70 it@@ -162,23 +162,25 @@ filter(int fd, const char *cmd) Err codevoid.de 70 i Image *ffopen(char *filename) Err codevoid.de 70 i { Err codevoid.de 70 i unsigned char hdr[16]; Err codevoid.de 70 i- char *bin; Err codevoid.de 70 i+ char *bin = NULL; Err codevoid.de 70 i regex_t regex; Err codevoid.de 70 i Image *img; Err codevoid.de 70 i size_t i; Err codevoid.de 70 i int tmpfd, fd; Err codevoid.de 70 i Err codevoid.de 70 i- for (bin = NULL, i = 0; i < LEN(filters); i++) { Err codevoid.de 70 i+ for (i = 0; i < LEN(filters); i++) { Err codevoid.de 70 i if (regcomp(®ex, filters[i].regex, Err codevoid.de 70 i REG_NOSUB | REG_EXTENDED | REG_ICASE)) Err codevoid.de 70 i continue; Err codevoid.de 70 i if (!regexec(®ex, filename, 0, NULL, 0)) { Err codevoid.de 70 i- if (!(bin = filters[i].bin)) Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i+ bin = filters[i].bin Err codevoid.de 70 i break; Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i+ if (!bin) Err codevoid.de 70 i+ return NULL; Err codevoid.de 70 i+ Err codevoid.de 70 i if ((fd = open(filename, O_RDONLY)) < 0) { Err codevoid.de 70 i eprintf("Unable to open file %s:", filename); Err codevoid.de 70 i return NULL; Err codevoid.de 70 it@@ -355,7 +357,7 @@ void ffdraw(Image *img) Err codevoid.de 70 i void getfontsize(Slide *s, unsigned int *width, unsigned int *height) Err codevoid.de 70 i { Err codevoid.de 70 i int i, j; Err codevoid.de 70 i- unsigned int curw, imax; Err codevoid.de 70 i+ unsigned int curw, new_max; Err codevoid.de 70 i float lfac = linespacing * (s->linecount - 1) + 1; Err codevoid.de 70 i Err codevoid.de 70 i /* fit height */ Err codevoid.de 70 it@@ -369,13 +371,12 @@ void getfontsize(Slide *s, unsigned int *width, unsigned int *height) Err codevoid.de 70 i *width = 0; Err codevoid.de 70 i for (i = 0; i < s->linecount; i++) { Err codevoid.de 70 i curw = drw_fontset_getwidth(d, s->lines[i]); Err codevoid.de 70 i- if (curw >= *width) Err codevoid.de 70 i- imax = i; Err codevoid.de 70 i+ newmax = (curw >= *width); Err codevoid.de 70 i while (j > 0 && curw > xw.uw) { Err codevoid.de 70 i drw_setfontset(d, fonts[--j]); Err codevoid.de 70 i curw = drw_fontset_getwidth(d, s->lines[i]); Err codevoid.de 70 i } Err codevoid.de 70 i- if (imax == i) Err codevoid.de 70 i+ if (newmax) Err codevoid.de 70 i *width = curw; Err codevoid.de 70 i } Err codevoid.de 70 i *height = fonts[j]->h * lfac; Err codevoid.de 70 .