Rework channelnumber/samplesize detetion code's output variables a bit to
convince gcc (4.0.x) the variables are never used uninitialized (and raising
a proper exception if they ever are.)
diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c
index f6d5b7d..769451a 100644
--- a/Modules/linuxaudiodev.c
+++ b/Modules/linuxaudiodev.c
@@ -332,7 +332,6 @@
default:
return -EOPNOTSUPP;
}
- *nchannels = 0;
if (ioctl(self->x_fd, SNDCTL_DSP_CHANNELS, nchannels) < 0)
return -errno;
return 0;
@@ -345,11 +344,11 @@
lad_bufsize(lad_t *self, PyObject *args)
{
audio_buf_info ai;
- int nchannels, ssize;
+ int nchannels=0, ssize=0;
if (!PyArg_ParseTuple(args, ":bufsize")) return NULL;
- if (_ssize(self, &nchannels, &ssize) < 0) {
+ if (_ssize(self, &nchannels, &ssize) < 0 || !ssize || !nchannels) {
PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
@@ -366,12 +365,12 @@
lad_obufcount(lad_t *self, PyObject *args)
{
audio_buf_info ai;
- int nchannels, ssize;
+ int nchannels=0, ssize=0;
if (!PyArg_ParseTuple(args, ":obufcount"))
return NULL;
- if (_ssize(self, &nchannels, &ssize) < 0) {
+ if (_ssize(self, &nchannels, &ssize) < 0 || !ssize || !nchannels) {
PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
@@ -389,12 +388,12 @@
lad_obuffree(lad_t *self, PyObject *args)
{
audio_buf_info ai;
- int nchannels, ssize;
+ int nchannels=0, ssize=0;
if (!PyArg_ParseTuple(args, ":obuffree"))
return NULL;
- if (_ssize(self, &nchannels, &ssize) < 0) {
+ if (_ssize(self, &nchannels, &ssize) < 0 || !ssize || !nchannels) {
PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}