Make "inline void proc_find_top" static to fix building with clang.
Index: patches/patch-src_openbsd_c
===================================================================
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_openbsd_c,v
retrieving revision 1.16
diff -u -p -r1.16 patch-src_openbsd_c
--- patches/patch-src_openbsd_c 16 Sep 2014 07:28:09 -0000 1.16
+++ patches/patch-src_openbsd_c 19 Apr 2017 20:15:48 -0000
@@ -10,7 +10,7 @@ Protect kvm_getprocs and global vars wit
dkstat.h is going away on OpenBSD, so use sys/sched.h instead for CP_*
--- src/openbsd.c.orig Thu May 3 23:08:27 2012
-+++ src/openbsd.c Tue Sep 16 08:40:12 2014
++++ src/openbsd.c Wed Apr 19 22:14:41 2017
@@ -28,10 +28,11 @@
*
*/
@@ -32,7 +32,16 @@ dkstat.h is going away on OpenBSD, so us
#include <machine/apmvar.h>
#include <net80211/ieee80211.h>
-@@ -81,6 +83,8 @@
+@@ -70,7 +72,7 @@
+ #define LOG1024 10
+ #define pagetok(size) ((size) << pageshift)
+
+-inline void proc_find_top(struct process **cpu, struct process **mem);
++static inline void proc_find_top(struct process **cpu, struct process **mem);
+
+ static short cpu_setup = 0;
+ static kvm_t *kd = 0;
+@@ -81,6 +83,8 @@ size_t len = 0;
int init_kvm = 0;
int init_sensors = 0;
@@ -41,7 +50,7 @@ dkstat.h is going away on OpenBSD, so us
static int kvm_init()
{
if (init_kvm) {
-@@ -140,7 +144,7 @@
+@@ -140,7 +144,7 @@ int check_mount(char *s)
return 0;
}
@@ -50,7 +59,7 @@ dkstat.h is going away on OpenBSD, so us
{
int mib[2] = { CTL_KERN, KERN_BOOTTIME };
struct timeval boottime;
-@@ -155,9 +159,10 @@
+@@ -155,9 +159,10 @@ void update_uptime()
NORM_ERR("Could not get uptime");
info.uptime = 0;
}
@@ -62,7 +71,7 @@ dkstat.h is going away on OpenBSD, so us
{
static int mib[2] = { CTL_VM, VM_METER };
struct vmtotal vmtotal;
-@@ -194,9 +199,10 @@
+@@ -194,9 +199,10 @@ void update_meminfo()
info.swap = 0;
info.swapfree = 0;
}
@@ -74,7 +83,7 @@ dkstat.h is going away on OpenBSD, so us
{
struct net_stat *ns;
double delta;
-@@ -207,11 +213,11 @@
+@@ -207,11 +213,11 @@ void update_net_stats()
/* get delta */
delta = current_update_time - last_update_time;
if (delta <= 0.0001) {
@@ -88,7 +97,7 @@ dkstat.h is going away on OpenBSD, so us
}
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
-@@ -266,28 +272,36 @@
+@@ -266,28 +272,36 @@ void update_net_stats()
}
freeifaddrs(ifap);
@@ -133,7 +142,7 @@ dkstat.h is going away on OpenBSD, so us
for (i = 0; i < n_processes; i++) {
if (p[i].p_stat == SRUN) {
cnt++;
-@@ -295,96 +309,64 @@
+@@ -295,96 +309,64 @@ void update_running_processes()
}
info.run_procs = cnt;
@@ -248,7 +257,7 @@ dkstat.h is going away on OpenBSD, so us
if (info.cpu_count > 1) {
size = CPUSTATES * sizeof(int64_t);
for (i = 0; i < info.cpu_count; i++) {
-@@ -426,10 +408,11 @@
+@@ -426,10 +408,11 @@ void update_cpu_usage()
oldused[i] = used;
oldtotal[i] = total;
}
@@ -262,7 +271,7 @@ dkstat.h is going away on OpenBSD, so us
{
double v[3];
-@@ -438,6 +421,7 @@
+@@ -438,6 +421,7 @@ void update_load_average()
info.loadavg[0] = (float) v[0];
info.loadavg[1] = (float) v[1];
info.loadavg[2] = (float) v[2];
@@ -270,7 +279,7 @@ dkstat.h is going away on OpenBSD, so us
}
#define OBSD_MAX_SENSORS 256
-@@ -606,10 +590,11 @@
+@@ -606,10 +590,11 @@ char get_freq(char *p_client_buffer, size_t client_buf
return 1;
}
@@ -283,7 +292,7 @@ dkstat.h is going away on OpenBSD, so us
}
#if 0
-@@ -665,19 +650,11 @@
+@@ -665,19 +650,11 @@ cleanup:
}
#endif
@@ -305,9 +314,12 @@ dkstat.h is going away on OpenBSD, so us
/* While topless is obviously better, top is also not bad. */
int comparecpu(const void *a, const void *b)
-@@ -708,8 +685,8 @@
+@@ -706,10 +683,10 @@ int comparemem(const void *a, const void *b)
+ return 0;
+ }
- inline void proc_find_top(struct process **cpu, struct process **mem)
+-inline void proc_find_top(struct process **cpu, struct process **mem)
++static inline void proc_find_top(struct process **cpu, struct process **mem)
{
- struct kinfo_proc2 *p;
- int n_processes;
@@ -316,7 +328,7 @@ dkstat.h is going away on OpenBSD, so us
int i, j = 0;
struct process *processes;
int mib[2];
-@@ -730,9 +707,11 @@
+@@ -730,9 +707,11 @@ inline void proc_find_top(struct process **cpu, struct
/* translate bytes into page count */
total_pages = usermem / pagesize;
@@ -330,7 +342,7 @@ dkstat.h is going away on OpenBSD, so us
processes = malloc(n_processes * sizeof(struct process));
for (i = 0; i < n_processes; i++) {
-@@ -740,9 +719,12 @@
+@@ -740,9 +719,12 @@ inline void proc_find_top(struct process **cpu, struct
processes[j].pid = p[i].p_pid;
processes[j].name = strndup(p[i].p_comm,
text_buffer_size);
processes[j].amount = 100.0 * p[i].p_pctcpu / FSCALE;
@@ -343,7 +355,7 @@ dkstat.h is going away on OpenBSD, so us
qsort(processes, j - 1, sizeof(struct process), comparemem);
for (i = 0; i < 10; i++) {
-@@ -752,6 +734,8 @@
+@@ -752,6 +734,8 @@ inline void proc_find_top(struct process **cpu, struct
tmp->pid = processes[i].pid;
tmp->amount = processes[i].amount;
tmp->name = strndup(processes[i].name, text_buffer_size);
@@ -352,7 +364,7 @@ dkstat.h is going away on OpenBSD, so us
ttmp = mem[i];
mem[i] = tmp;
-@@ -769,6 +753,8 @@
+@@ -769,6 +753,8 @@ inline void proc_find_top(struct process **cpu, struct
tmp->pid = processes[i].pid;
tmp->amount = processes[i].amount;
tmp->name = strndup(processes[i].name, text_buffer_size);
@@ -361,7 +373,7 @@ dkstat.h is going away on OpenBSD, so us
ttmp = cpu[i];
cpu[i] = tmp;
-@@ -784,7 +770,6 @@
+@@ -784,7 +770,6 @@ inline void proc_find_top(struct process **cpu, struct
free(processes);
}
@@ -369,7 +381,7 @@ dkstat.h is going away on OpenBSD, so us
#define APMDEV "/dev/apm"
#define APM_UNKNOWN 255
-@@ -908,7 +893,6 @@
+@@ -908,7 +893,6 @@ char *get_apm_battery_time()
return out;
}
@@ -377,7 +389,7 @@ dkstat.h is going away on OpenBSD, so us
/* empty stubs so conky links */
void prepare_update()
-@@ -923,8 +907,4 @@
+@@ -923,8 +907,4 @@ int get_entropy_avail(unsigned int *val)
int get_entropy_poolsize(unsigned int *val)
{
return 1;
