From fbcd31253bbe5e46eca2403b4fee7a75ee502803 Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Tue, 14 Jun 2011 19:12:44 +0200 Subject: [PATCH] Draw: Clean draw_text and textw --- src/draw.c | 28 +++++++--------------------- src/status.c | 4 ++-- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/draw.c b/src/draw.c index 39b2722..9dbe325 100644 --- a/src/draw.c +++ b/src/draw.c @@ -112,23 +112,13 @@ parse_image_block(Drawable dr, char *str) void draw_text(Drawable d, int x, int y, char* fg, char *str) { -#ifdef HAVE_IMLIB - char *ostr = NULL; - int i, ni, sw = 0; - size_t textlen; - bool ii = False; -#else - (void)x_image_ofset; - (void)y_image_ofset; -#endif /* HAVE_IMLIB */ - - if(!str) - return; + CHECK(str); /* To draw image everywhere we can draw text */ #ifdef HAVE_IMLIB - ostr = xstrdup(str); - textlen = strlen(ostr); + char *ostr = xstrdup(str); + bool ii = False; + size_t textlen = strlen(ostr); if(strstr(str, "i[")) { @@ -230,18 +220,14 @@ textw(char *text) { Drawable d = 0; ushort ret = 0; -#ifdef HAVE_IMLIB - char *ostr = NULL; - size_t textlen; - bool ii = False; -#endif /* HAVE_IMLIB */ if(!text) return 0; #ifdef HAVE_IMLIB - ostr = xstrdup(text); - textlen = strlen(ostr); + char *ostr = xstrdup(text); + size_t textlen = strlen(ostr); + bool ii = False; if(strstr(text, "i[")) { diff --git a/src/status.c b/src/status.c index beef66b..58b734f 100644 --- a/src/status.c +++ b/src/status.c @@ -107,7 +107,7 @@ statustext_graph(InfoBar *ib, char *str) else if(j != i) str[j] = str[i]; - for(k = j; k < i; str[k++] = 0); + for(k = j; k < i; str[k++] = '\0'); return; } @@ -135,7 +135,7 @@ statustext_text(InfoBar *ib, char *str) else if(j != i) str[j] = str[i]; - for(k = j; k < i; str[k++] = 0); + for(k = j; k < i; str[k++] = '\0'); return; }