Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00
Code Issues Releases Activity

OpenBSD cleanups, remove unsupported printf flag and fix non-dynamic cpu_freq

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@964 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Toni Spets 2007-09-17 04:40:13 +00:00
parent 0b8f5703bd
commit 60f4ea4fb7
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conky.c
View File

@ -3577,7 +3577,13 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
} }
OBJ(freq_g) { OBJ(freq_g) {
if (obj->a) { if (obj->a) {
#ifndef __OpenBSD__
obj->a = get_freq(p, p_max_size, "%'.2f", 1000, obj->data.cpu_index); obj->a = get_freq(p, p_max_size, "%'.2f", 1000, obj->data.cpu_index);
#else
/* OpenBSD has no such flag (SUSv2) */
obj->a = get_freq(p, p_max_size, "%.2f", 1000, obj->data.cpu_index);
#endif
} }
} }
#if defined(__linux__) #if defined(__linux__)
@ -3640,9 +3646,17 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
} }
OBJ(freq_dyn_g) { OBJ(freq_dyn_g) {
if (use_spacer) { if (use_spacer) {
#ifndef __OpenBSD__
get_freq_dynamic(p, 6, "%'.2f ", 1000); get_freq_dynamic(p, 6, "%'.2f ", 1000);
#else
get_freq_dynamic(p, 6, "%.2f ", 1000);
#endif
} else { } else {
#ifndef __OpenBSD__
get_freq_dynamic(p, p_max_size, "%'.2f", 1000); get_freq_dynamic(p, p_max_size, "%'.2f", 1000);
#else
get_freq_dynamic(p, p_max_size, "%.2f", 1000);
#endif
} }
} }
#ifndef __OpenBSD__ #ifndef __OpenBSD__

2
src/openbsd.c
View File

@ -497,7 +497,7 @@ get_freq_dynamic(char *p_client_buffer, size_t client_buffer_size,
snprintf(p_client_buffer, client_buffer_size, p_format, snprintf(p_client_buffer, client_buffer_size, p_format,
(float)((cycles[1] - cycles[0]) / microseconds) / divisor); (float)((cycles[1] - cycles[0]) / microseconds) / divisor);
#else #else
get_freq(p_client_buffer, client_buffer_size, p_format, divisor); get_freq(p_client_buffer, client_buffer_size, p_format, divisor, 1);
#endif #endif
} }