Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-23 19:39:06 +00:00
Code Issues Releases Activity

we don't need a warning every time

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@655 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2006-05-22 17:12:39 +00:00
parent e2c2f22c37
commit a426a15d16
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conky.c
View File

@ -1980,10 +1980,6 @@ static struct text_object *construct_text_object(const char *s, const char *arg,
END OBJ(acpiacadapter, 0)
#if defined(__linux__)
END OBJ(freq, 0)
/* gives an 'implicit declaration' warning when compiled
not nice but as of now it shouldn't be a problem: only
linux.c and freebsd.c have get_freq functions and both platforms
have their respective get_cpu_count() functions (ptarjan) */
get_cpu_count();
if (!arg
|| !isdigit(arg[0])
@ -1992,17 +1988,13 @@ static struct text_object *construct_text_object(const char *s, const char *arg,
|| (unsigned int)atoi(&arg[0])>info.cpu_count)
{
obj->data.cpu_index=1;
ERR("freq: Invalid CPU number or you don't have that many CPUs! Displaying the clock for CPU 1.");
// ERR("freq: Invalid CPU number or you don't have that many CPUs! Displaying the clock for CPU 1.");
}
else
{
obj->data.cpu_index=atoi(&arg[0]);
}
END OBJ(freq_g, 0)
/* gives an 'implicit declaration' warning when compiled
not nice but as of now it shouldn't be a problem: only
linux.c and freebsd.c have get_freq functions and both platforms
have their respective get_cpu_count() functions (ptarjan) */
get_cpu_count();
if (!arg
|| !isdigit(arg[0])
@ -2011,7 +2003,7 @@ static struct text_object *construct_text_object(const char *s, const char *arg,
|| (unsigned int)atoi(&arg[0])>info.cpu_count)
{
obj->data.cpu_index=1;
ERR("freq_g: Invalid CPU number or you don't have that many CPUs! Displaying the clock for CPU 1.");
// ERR("freq_g: Invalid CPU number or you don't have that many CPUs! Displaying the clock for CPU 1.");
}
else
{