spoon

commit cc9730b94b734a1cd45163d8ab57e156e3bb2f59
parent 1299e08d72f8fd99c4d251c1c725bf7c3e438a23
Author: sin <sin@2f30.org>
Date:   Wed, 14 Mar 2018 10:48:13 +0000

No need for cpu args struct

Diffstat:
M
config.def.h
 | 
2
+-
M
cpu.c
 | 
8
+++-----
M
types.h
 | 
4
----

3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -7,7 +7,7 @@ struct ent ents[] = {
 	{ .fmt = "[%s] ",	.read = countread,	.arg = (char []){"/home/USER/Maildir/INBOX/new"} },
 	{ .fmt = "[%s] ",	.read = mixread,	.arg = NULL },
 	{ .fmt = "[%s] ",	.read = loadread,	.arg = NULL },
-	{ .fmt = "[%s] ",	.read = cpuread,	.arg = &(struct cpuarg){ .freq = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" } },
+	{ .fmt = "[%s] ",	.read = cpuread,	.arg = "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq" },
 	{ .fmt = "[%s°] ",	.read = tempread,	.arg = "/sys/class/hwmon/hwmon1/temp1_input" },
 	{ .fmt = "%s ",		.read = battread,	.arg = &(struct battarg){ .cap = "/sys/class/power_supply/BAT0/capacity", .ac = "/sys/class/power_supply/AC/online" } },
 	{ .fmt = "%s ",		.read = wifiread,	.arg = NULL },
diff --git a/cpu.c b/cpu.c
@@ -1,8 +1,6 @@
 #include <err.h>
 #include <stdio.h>
 
-#include "types.h"
-
 #ifdef __OpenBSD__
 #include <sys/sysctl.h>
 
@@ -24,13 +22,13 @@ cpuread(void *arg, char *buf, size_t len)
 int
 cpuread(void *arg, char *buf, size_t len)
 {
-	struct cpuarg *cpuarg = arg;
+	char *path = arg;
 	FILE *fp;
 	int freq;
 
-	fp = fopen(cpuarg->freq, "r");
+	fp = fopen(path, "r");
 	if (fp == NULL) {
-		warn("fopen %s", cpuarg->freq);
+		warn("fopen %s", path);
 		return -1;
 	}
 	fscanf(fp, "%d", &freq);
diff --git a/types.h b/types.h
@@ -3,10 +3,6 @@ struct battarg {
 	char *ac;
 };
 
-struct cpuarg {
-	char *freq;
-};
-
 struct mpdarg {
 	char *host;
 	unsigned int port;