From d55d96f61724d948b8232f933e0a93c5ba8aec6b Mon Sep 17 00:00:00 2001
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Mon, 17 Jul 2006 17:43:06 +0000
Subject: [PATCH] Rename some variables. This fixes some (but not all) problems
 on the way for WARNS > 2 cleanlyness.

Submitted by:	Yuriy Tsibizov <Yuriy.Tsibizov@gfk.ru>
---
 sys/dev/sound/pcm/buffer.c | 4 ++--
 sys/dev/sound/pcm/buffer.h | 2 +-
 sys/dev/sound/pcm/sound.c  | 8 ++++----
 sys/dev/sound/pcm/sound.h  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index b8570f7ad02..0be87415b5f 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -399,11 +399,11 @@ sndbuf_getxrun(struct snd_dbuf *b)
 }
 
 void
-sndbuf_setxrun(struct snd_dbuf *b, unsigned int cnt)
+sndbuf_setxrun(struct snd_dbuf *b, unsigned int xrun)
 {
 	SNDBUF_LOCKASSERT(b);
 
-	b->xrun = cnt;
+	b->xrun = xrun;
 }
 
 unsigned int
diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h
index 7b2bffbe127..dbbabd9b436 100644
--- a/sys/dev/sound/pcm/buffer.h
+++ b/sys/dev/sound/pcm/buffer.h
@@ -93,7 +93,7 @@ void sndbuf_setrun(struct snd_dbuf *b, int go);
 struct selinfo *sndbuf_getsel(struct snd_dbuf *b);
 
 unsigned int sndbuf_getxrun(struct snd_dbuf *b);
-void sndbuf_setxrun(struct snd_dbuf *b, unsigned int cnt);
+void sndbuf_setxrun(struct snd_dbuf *b, unsigned int xrun);
 unsigned int sndbuf_gethwptr(struct snd_dbuf *b);
 void sndbuf_sethwptr(struct snd_dbuf *b, unsigned int ptr);
 unsigned int sndbuf_getfree(struct snd_dbuf *b);
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index e2030130fc5..6078758d3db 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -796,7 +796,7 @@ pcm_getdevinfo(device_t dev)
 }
 
 unsigned int
-pcm_getbuffersize(device_t dev, unsigned int min, unsigned int deflt, unsigned int max)
+pcm_getbuffersize(device_t dev, unsigned int minbufsz, unsigned int deflt, unsigned int maxbufsz)
 {
 	struct snddev_info *d = device_get_softc(dev);
 	int sz, x;
@@ -804,10 +804,10 @@ pcm_getbuffersize(device_t dev, unsigned int min, unsigned int deflt, unsigned i
 	sz = 0;
 	if (resource_int_value(device_get_name(dev), device_get_unit(dev), "buffersize", &sz) == 0) {
 		x = sz;
-		RANGE(sz, min, max);
+		RANGE(sz, minbufsz, maxbufsz);
 		if (x != sz)
-			device_printf(dev, "'buffersize=%d' hint is out of range (%d-%d), using %d\n", x, min, max, sz);
-		x = min;
+			device_printf(dev, "'buffersize=%d' hint is out of range (%d-%d), using %d\n", x, minbufsz, maxbufsz, sz);
+		x = minbufsz;
 		while (x < sz)
 			x <<= 1;
 		if (x > sz)
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index dd4af6374de..045e1e57c0b 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -222,7 +222,7 @@ int pcm_chn_add(struct snddev_info *d, struct pcm_channel *ch);
 int pcm_chn_remove(struct snddev_info *d, struct pcm_channel *ch);
 
 int pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo);
-unsigned int pcm_getbuffersize(device_t dev, unsigned int min, unsigned int deflt, unsigned int max);
+unsigned int pcm_getbuffersize(device_t dev, unsigned int minbufsz, unsigned int deflt, unsigned int maxbufsz);
 int pcm_register(device_t dev, void *devinfo, int numplay, int numrec);
 int pcm_unregister(device_t dev);
 int pcm_setstatus(device_t dev, char *str);