Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-28 04:55:08 +00:00
Code Issues Releases Activity

Merge branch 'master' into imlib2

Browse Source
This commit is contained in:
Brenden Matthews 2009-05-07 12:49:13 -06:00
commit a1fc53be97
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2009-05-07
* Fix occasional cpubar segfaults
2009-05-05 2009-05-05
* Added some completely pointless OpenMP optimizations(?) * Added some completely pointless OpenMP optimizations(?)

2
src/conky.c
View File

@ -1299,7 +1299,7 @@ static struct text_object *construct_text_object(const char *s,
END OBJ(cached, INFO_BUFFERS) END OBJ(cached, INFO_BUFFERS)
#define SCAN_CPU(__arg, __var) { \ #define SCAN_CPU(__arg, __var) { \
int __offset; \ int __offset; \
if (__arg && sscanf(__arg, " cpu%u %n", &__var, &__offset)) \ if (__arg && sscanf(__arg, " cpu%u %n", &__var, &__offset) == 2) \
__arg += __offset; \ __arg += __offset; \
else \ else \
__var = 0; \ __var = 0; \