diff options
| author | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2012-04-11 06:05:44 +0000 |
|---|---|---|
| committer | Alexandre Ratchov <ratchov@cvs.openbsd.org> | 2012-04-11 06:05:44 +0000 |
| commit | 61de1370078d8018aa3697f8700e90150a0e97f0 (patch) | |
| tree | 37edec6d5e4b8f39c1c9b8174acebb1e2c8b54ae /lib/libsndio/sio_aucat.c | |
| parent | cc808ad5eaeb6f21df2ea9a638191d88edf05078 (diff) | |
Use "unsigned int" rather than "unsigned". No object change.
suggested by deraadt@
Diffstat (limited to 'lib/libsndio/sio_aucat.c')
| -rw-r--r-- | lib/libsndio/sio_aucat.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/libsndio/sio_aucat.c b/lib/libsndio/sio_aucat.c index 2a97b878930..99153092780 100644 --- a/lib/libsndio/sio_aucat.c +++ b/lib/libsndio/sio_aucat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sio_aucat.c,v 1.9 2011/11/15 08:05:22 ratchov Exp $ */ +/* $OpenBSD: sio_aucat.c,v 1.10 2012/04/11 06:05:43 ratchov Exp $ */ /* * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org> * @@ -34,10 +34,10 @@ struct sio_aucat_hdl { struct sio_hdl sio; struct aucat aucat; - unsigned rbpf, wbpf; /* read and write bytes-per-frame */ + unsigned int rbpf, wbpf; /* read and write bytes-per-frame */ int maxwrite; /* latency constraint */ int events; /* events the user requested */ - unsigned curvol, reqvol; /* current and requested volume */ + unsigned int curvol, reqvol; /* current and requested volume */ int delta; /* some of received deltas */ #define PSTATE_INIT 0 #define PSTATE_RUN 1 @@ -55,7 +55,7 @@ static size_t sio_aucat_write(struct sio_hdl *, const void *, size_t); static int sio_aucat_nfds(struct sio_hdl *); static int sio_aucat_pollfd(struct sio_hdl *, struct pollfd *, int); static int sio_aucat_revents(struct sio_hdl *, struct pollfd *); -static int sio_aucat_setvol(struct sio_hdl *, unsigned); +static int sio_aucat_setvol(struct sio_hdl *, unsigned int); static void sio_aucat_getvol(struct sio_hdl *); static struct sio_ops sio_aucat_ops = { @@ -81,7 +81,7 @@ static int sio_aucat_runmsg(struct sio_aucat_hdl *hdl) { int delta; - unsigned size, ctl; + unsigned int size, ctl; if (!aucat_rmsg(&hdl->aucat, &hdl->sio.eof)) return 0; @@ -149,7 +149,7 @@ sio_aucat_buildmsg(struct sio_aucat_hdl *hdl) } struct sio_hdl * -sio_aucat_open(const char *str, unsigned mode, int nbio) +sio_aucat_open(const char *str, unsigned int mode, int nbio) { struct sio_aucat_hdl *hdl; @@ -214,7 +214,7 @@ sio_aucat_stop(struct sio_hdl *sh) #define ZERO_MAX 0x400 static unsigned char zero[ZERO_MAX]; struct sio_aucat_hdl *hdl = (struct sio_aucat_hdl *)sh; - unsigned n, count; + unsigned int n, count; if (!aucat_setfl(&hdl->aucat, 0, &hdl->sio.eof)) return 0; @@ -327,8 +327,8 @@ sio_aucat_getpar(struct sio_hdl *sh, struct sio_par *par) static int sio_aucat_getcap(struct sio_hdl *sh, struct sio_cap *cap) { - unsigned i, bps, le, sig, chan, rindex, rmult; - static unsigned rates[] = { 8000, 11025, 12000 }; + unsigned int i, bps, le, sig, chan, rindex, rmult; + static unsigned int rates[] = { 8000, 11025, 12000 }; bps = 1; sig = le = 0; @@ -389,7 +389,7 @@ sio_aucat_getcap(struct sio_hdl *sh, struct sio_cap *cap) cap->rate[i] = rates[rindex] * rmult; cap->confs[0].rate |= 1 << i; rindex++; - if (rindex == sizeof(rates) / sizeof(unsigned)) { + if (rindex == sizeof(rates) / sizeof(unsigned int)) { rindex = 0; rmult *= 2; } @@ -471,7 +471,7 @@ sio_aucat_revents(struct sio_hdl *sh, struct pollfd *pfd) } static int -sio_aucat_setvol(struct sio_hdl *sh, unsigned vol) +sio_aucat_setvol(struct sio_hdl *sh, unsigned int vol) { struct sio_aucat_hdl *hdl = (struct sio_aucat_hdl *)sh; |