Make code fit in 80 columns, remove trailing spaces & tabs.

7 files changed, 24 insertions, 21 deletions

diff --git a/lib/libsndio/amsg.h b/lib/libsndio/amsg.h
index d3a5b0cebd5..a9f5e125726 100644
--- a/lib/libsndio/amsg.h
+++ b/lib/libsndio/amsg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amsg.h,v 1.9 2015/10/02 09:36:24 ratchov Exp $	*/
+/*	$OpenBSD: amsg.h,v 1.10 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-/* 
+/*
  * unix-domain socket name is:
  *
  * DIR [ '-' UID ] '/' FILE UNIT
diff --git a/lib/libsndio/aucat.c b/lib/libsndio/aucat.c
index 8b488430ddc..600216db984 100644
--- a/lib/libsndio/aucat.c
+++ b/lib/libsndio/aucat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aucat.c,v 1.70 2015/12/23 20:29:57 mmcc Exp $	*/
+/*	$OpenBSD: aucat.c,v 1.71 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -429,9 +429,9 @@ _aucat_open(struct aucat *hdl, const char *str, unsigned int mode)
 
 	if ((p = _sndio_parsetype(str, "snd")) != NULL)
 		type = 0;
- 	else if ((p = _sndio_parsetype(str, "midithru")) != NULL)
+	else if ((p = _sndio_parsetype(str, "midithru")) != NULL)
 		type = 1;
- 	else if ((p = _sndio_parsetype(str, "midi")) != NULL)
+	else if ((p = _sndio_parsetype(str, "midi")) != NULL)
 		type = 2;
 	else {
 		DPRINTF("%s: unsupported device type\n", str);
diff --git a/lib/libsndio/mio_aucat.c b/lib/libsndio/mio_aucat.c
index 9cef7b6fa61..e0f6207fcb5 100644
--- a/lib/libsndio/mio_aucat.c
+++ b/lib/libsndio/mio_aucat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mio_aucat.c,v 1.11 2015/11/22 12:01:23 ratchov Exp $	*/
+/*	$OpenBSD: mio_aucat.c,v 1.12 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -74,7 +74,8 @@ mio_aucat_runmsg(struct mio_aucat_hdl *hdl)
 		    delta, hdl->aucat.maxwrite);
 		break;
 	default:
-		DPRINTF("mio_aucat_runmsg: unhandled message %u\n", hdl->aucat.rmsg.cmd);
+		DPRINTF("mio_aucat_runmsg: unhandled message %u\n",
+		    hdl->aucat.rmsg.cmd);
 		hdl->mio.eof = 1;
 		return 0;
 	}
diff --git a/lib/libsndio/mio_rmidi.c b/lib/libsndio/mio_rmidi.c
index 7034873b37c..0c13bc4762d 100644
--- a/lib/libsndio/mio_rmidi.c
+++ b/lib/libsndio/mio_rmidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mio_rmidi.c,v 1.23 2015/12/20 11:29:29 ratchov Exp $	*/
+/*	$OpenBSD: mio_rmidi.c,v 1.24 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -180,7 +180,7 @@ mio_rmidi_write(struct mio_hdl *sh, const void *buf, size_t len)
 			DPERROR("mio_rmidi_write: write");
 			hdl->mio.eof = 1;
 		}
- 		return 0;
+		return 0;
 	}
 	return n;
 }
diff --git a/lib/libsndio/sio.c b/lib/libsndio/sio.c
index 1e4f965c862..ea7dfdc6fd7 100644
--- a/lib/libsndio/sio.c
+++ b/lib/libsndio/sio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio.c,v 1.20 2015/11/22 12:01:23 ratchov Exp $	*/
+/*	$OpenBSD: sio.c,v 1.21 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -152,7 +152,7 @@ sio_setpar(struct sio_hdl *hdl, struct sio_par *par)
 		return 0;
 	}
 	if (par->__magic != SIO_PAR_MAGIC) {
-		DPRINTF("sio_setpar: use of uninitialized sio_par structure\n");
+		DPRINTF("sio_setpar: uninitialized sio_par structure\n");
 		hdl->eof = 1;
 		return 0;
 	}
@@ -435,7 +435,7 @@ sio_onmove(struct sio_hdl *hdl, void (*cb)(void *, int), void *addr)
 #ifdef DEBUG
 void
 _sio_printpos(struct sio_hdl *hdl)
-{	
+{
 	struct timespec ts;
 	long long rpos, rdiff;
 	long long cpos, cdiff;
@@ -448,7 +448,7 @@ _sio_printpos(struct sio_hdl *hdl)
 	rround = hdl->par.round * rbpf;
 	wround = hdl->par.round * wbpf;
 
-	rpos = (hdl->mode & SIO_REC) ? 
+	rpos = (hdl->mode & SIO_REC) ?
 	    hdl->cpos * rbpf - hdl->rused : 0;
 	wpos = (hdl->mode & SIO_PLAY) ?
 	    hdl->cpos * wbpf + hdl->wused : 0;
diff --git a/lib/libsndio/sio_aucat.c b/lib/libsndio/sio_aucat.c
index d05c042c555..74a1ecdd13e 100644
--- a/lib/libsndio/sio_aucat.c
+++ b/lib/libsndio/sio_aucat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio_aucat.c,v 1.19 2015/11/22 12:01:23 ratchov Exp $	*/
+/*	$OpenBSD: sio_aucat.c,v 1.20 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -124,7 +124,8 @@ sio_aucat_runmsg(struct sio_aucat_hdl *hdl)
 		hdl->pstate = PSTATE_INIT;
 		break;
 	default:
-		DPRINTF("sio_aucat_runmsg: unhandled message %u\n", hdl->aucat.rmsg.cmd);
+		DPRINTF("sio_aucat_runmsg: unhandled message %u\n",
+		    hdl->aucat.rmsg.cmd);
 		hdl->sio.eof = 1;
 		return 0;
 	}
diff --git a/lib/libsndio/sio_sun.c b/lib/libsndio/sio_sun.c
index 51928f868a0..ef770269044 100644
--- a/lib/libsndio/sio_sun.c
+++ b/lib/libsndio/sio_sun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio_sun.c,v 1.24 2015/12/20 11:29:29 ratchov Exp $	*/
+/*	$OpenBSD: sio_sun.c,v 1.25 2016/01/09 08:27:24 ratchov Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -564,7 +564,8 @@ sio_sun_setpar(struct sio_hdl *sh, struct sio_par *par)
 		}
 		DPRINTFN(2, "sio_sun_setpar: %i: trying pars = %u/%u/%u\n",
 		    i, rate, prec, enc);
-		if (ioctl(hdl->fd, AUDIO_SETINFO, &aui) < 0 && errno != EINVAL) {
+		if (ioctl(hdl->fd, AUDIO_SETINFO, &aui) < 0 &&
+		    errno != EINVAL) {
 			DPERROR("sio_sun_setpar: setinfo(pars)");
 			hdl->sio.eof = 1;
 			return 0;
@@ -585,7 +586,7 @@ sio_sun_setpar(struct sio_hdl *sh, struct sio_par *par)
 		case AUDIO_ENCODING_ULINEAR:
 			break;
 		default:
-			DPRINTF("sio_sun_setpar: couldn't set linear encoding\n");
+			DPRINTF("sio_sun_setpar: couldn't find encoding\n");
 			hdl->sio.eof = 1;
 			return 0;
 		}
@@ -676,7 +677,7 @@ sio_sun_setpar(struct sio_hdl *sh, struct sio_par *par)
 		}
 		infr = aui.record.block_size / ibpf;
 		onfr = aui.play.block_size / obpf;
-		DPRINTFN(2, "sio_sun_setpar: %i: trying round = %u -> (%u, %u)\n",
+		DPRINTFN(2, "sio_sun_setpar: %i: round = %u -> (%u, %u)\n",
 		    i, round, infr, onfr);
 
 		/*
@@ -806,7 +807,7 @@ sio_sun_write(struct sio_hdl *sh, const void *buf, size_t len)
 			DPERROR("sio_sun_write: write");
 			hdl->sio.eof = 1;
 		}
- 		return 0;
+		return 0;
 	}
 	if (hdl->filling) {
 		if (!sio_sun_autostart(hdl))
@@ -851,7 +852,7 @@ sio_sun_revents(struct sio_hdl *sh, struct pollfd *pfd)
 		doerr = (ap.play_xrun - hdl->oerr) / hdl->obpf;
 		hdl->obytes = ap.play_pos;
 		hdl->oerr = ap.play_xrun;
-		hdl->odelta += delta;	
+		hdl->odelta += delta;
 		if (!(hdl->sio.mode & SIO_REC)) {
 			hdl->idelta += delta;
 			dierr = doerr;