rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

conky: correct my own pointer misuse, d'oh

This commit is contained in:
nia 2020-08-30 11:55:59 +01:00
parent 4e2f945fcc
commit 6378b33fee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conky/distinfo
View File

@ -9,5 +9,5 @@ SHA1 (patch-cmake_Conky.cmake) = b17fdb4dfa968aa4437eb26e68efa5fc308c759d
SHA1 (patch-cmake_ConkyPlatformChecks.cmake) = 14d9dad017d4f7e45f883288ffa14146ce09d853
SHA1 (patch-src_entropy.cc) = be1ac9bddde941d698f2e66dfef05d668eda3216
SHA1 (patch-src_fs.cc) = 02fd3433c353dd883cc9ea2d4593279aee6e22c8
SHA1 (patch-src_netbsd.cc) = 346cf7dc5d4d8897ca4871a1763199ce27aa5f57
SHA1 (patch-src_netbsd.cc) = d07fbce360a1a06fd230df8cf0fd4de5702f4801
SHA1 (patch-src_netbsd.h) = 7c7df63b6ffac9e8ad23f5371b8c3d25ff733ab2

6
conky/patches/patch-src_netbsd.cc
View File

@ -567,14 +567,14 @@ $NetBSD$
+char get_freq(char *p_client_buffer, size_t client_buffer_size,
+ const char *p_format, int divisor, unsigned int cpu) {
+ char name[64];
+ const char *s;
+ const char **s;
+ int freq = 0;
+ size_t freq_size = sizeof(freq);
+
+ snprintf(name, sizeof(name), "machdep.cpufreq.cpu%u.current", cpu - 1);
+ if (sysctlbyname(name, &freq, &freq_size, NULL, 0) == -1) {
+ for (s = *freq_sysctls; s != NULL; ++s) {
+ if (sysctlbyname(s, &freq, &freq_size, NULL, 0) != -1)
+ for (s = freq_sysctls; *s != NULL; ++s) {
+ if (sysctlbyname(*s, &freq, &freq_size, NULL, 0) != -1)
+ break;
+ }
+ }