GopherProxy

	Avoid unneeded global variable in mix.c - spoon - set dwm status
	git clone git://git.codemadness.org/spoon
	Log
	Files
	Refs
	LICENSE
	---
	commit e2b14ba1aa3e7e57fadb927732bc6c782633b415
	parent a231da1528ee804fec2b6f7cb4d896bd81a4cf1a
	Author: Lucas <[email protected]>
	Date: Sun, 3 May 2020 13:36:08 +0000

	Avoid unneeded global variable in mix.c

	Diffstat:
	M mix.c \| 18 ++++++------------

	1 file changed, 6 insertions(+), 12 deletions(-)
	---
	diff --git a/mix.c b/mix.c
	@@ -20,21 +20,20 @@ static struct {
	int val;
	} channel[MAX_CHANNELS];
	static size_t nchannels = 0;
	-static int output = 0;

	-static void
	-update_output_value(void)
	+static int
	+get_output(void)
	{
	size_t i;
	int val;

	if (nchannels == 0)
	- return;
	+ return 0;

	val = 0;
	for (i = 0; i < nchannels; i++)
	val += channel[i].val;
	- output = 100 * ((val / (double)nchannels) / 255.0);
	+ return 100 * ((val / (double)nchannels) / 255.0);
	}

	static void
	@@ -42,10 +41,8 @@ ondesc(void arg, struct sioctl_desc desc, int val)
	{
	size_t i;

	- if (desc == NULL) {
	- update_output_value();
	+ if (desc == NULL)
	return;
	- }

	if (desc->type != SIOCTL_NUM \|\|
	strcmp(desc->func, "level") != 0 \|\|
	@@ -80,9 +77,6 @@ onval(void *arg, unsigned int addr, unsigned int val)
	channel[i].val = val;
	break;
	}
	-
	- if (i < nchannels)
	- update_output_value();
	}

	static int
	@@ -154,7 +148,7 @@ mixread(void arg, char buf, size_t len)
	}

	init_done = poll_peek();
	- snprintf(buf, len, "%d%%", output);
	+ snprintf(buf, len, "%d%%", get_output());

	return 0;
	}