pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

conky: correct my own pointer misuse, d'oh



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Sun Aug 30 11:55:59 2020 +0100
Changeset:	6378b33fee02c01c1e90c1c6d602a87feabf70c9

Modified Files:
	conky/distinfo
	conky/patches/patch-src_netbsd.cc

Log Message:
conky: correct my own pointer misuse, d'oh

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6378b33fee02c01c1e90c1c6d602a87feabf70c9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 conky/distinfo                    | 2 +-
 conky/patches/patch-src_netbsd.cc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/conky/distinfo b/conky/distinfo
index dca517cde0..fb762ca867 100644
--- a/conky/distinfo
+++ b/conky/distinfo
@@ -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
diff --git a/conky/patches/patch-src_netbsd.cc b/conky/patches/patch-src_netbsd.cc
index 6ce80a4d83..2264abdac0 100644
--- a/conky/patches/patch-src_netbsd.cc
+++ b/conky/patches/patch-src_netbsd.cc
@@ -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;
 +    }
 +  }


Home | Main Index | Thread Index | Old Index