Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[draw] Do not declare vars in blocs

This commit is contained in:
Julien Danjou 2008-04-17 11:28:56 +02:00
parent 059829e37e
commit c3642713b9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/draw.c
View File

@ -929,6 +929,8 @@ draw_color_new(xcb_connection_t *conn, int phys_screen, const char *colstr, xcol
xcb_screen_t *s = xcb_aux_get_screen(conn, phys_screen); xcb_screen_t *s = xcb_aux_get_screen(conn, phys_screen);
xcb_alloc_color_reply_t *hexa_color = NULL; xcb_alloc_color_reply_t *hexa_color = NULL;
xcb_alloc_named_color_reply_t *named_color = NULL; xcb_alloc_named_color_reply_t *named_color = NULL;
unsigned long colnum;
uint16_t red, green, blue;
if(!a_strlen(colstr)) if(!a_strlen(colstr))
return false; return false;
@ -937,16 +939,16 @@ draw_color_new(xcb_connection_t *conn, int phys_screen, const char *colstr, xcol
if(colstr[0] == '#' && a_strlen(colstr) == 7) if(colstr[0] == '#' && a_strlen(colstr) == 7)
{ {
errno = 0; errno = 0;
unsigned long colnum = strtoul(&colstr[1], NULL, 16); colnum = strtoul(&colstr[1], NULL, 16);
if(errno != 0) if(errno != 0)
{ {
warn("awesome: error, invalid color '%s'\n", colstr); warn("awesome: error, invalid color '%s'\n", colstr);
return false; return false;
} }
uint16_t red = RGB_COLOR_8_TO_16(colnum >> 16); red = RGB_COLOR_8_TO_16(colnum >> 16);
uint16_t green = RGB_COLOR_8_TO_16(colnum >> 8); green = RGB_COLOR_8_TO_16(colnum >> 8);
uint16_t blue = RGB_COLOR_8_TO_16(colnum); blue = RGB_COLOR_8_TO_16(colnum);
hexa_color = xcb_alloc_color_reply(conn, hexa_color = xcb_alloc_color_reply(conn,
xcb_alloc_color(conn, xcb_alloc_color(conn,