phundrak/sent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix 2 uninitialized variables and bin == NULL check

Browse Source
This commit is contained in:
Markus Teich 2015-12-09 00:50:05 +01:00
parent edb4630564
commit 008ff1b88b
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drw.c
View File

@ -228,7 +228,7 @@ int
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) { drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) {
char buf[1024]; char buf[1024];
int tx, ty, th; int tx, ty, th;
unsigned int ew; unsigned int ew = 0;
Colormap cmap; Colormap cmap;
Visual *vis; Visual *vis;
XftDraw *d; XftDraw *d;

17
sent.c
View File

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