summaryrefslogtreecommitdiffstats
path: root/Modules/ossaudiodev.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-03-20 09:37:34 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-03-20 09:37:34 (GMT)
commit99953006df1414b048bfc76f66cb36a0fb31a4b7 (patch)
treea3f5d536c166e6ef316ae9b769ebf41ddcb883c9 /Modules/ossaudiodev.c
parent716a74ea2299ed2e3e0594c14177de0d68e2d4b6 (diff)
downloadcpython-99953006df1414b048bfc76f66cb36a0fb31a4b7.zip
cpython-99953006df1414b048bfc76f66cb36a0fb31a4b7.tar.gz
cpython-99953006df1414b048bfc76f66cb36a0fb31a4b7.tar.bz2
Issue #23709, #23001: ossaudiodev now uses Py_ssize_t for sizes instead of int
The module is now also "SSIZE_T clean" (for PyArg_Parse...() functions) since it switched to Py_buffer ("y*" argument format).
Diffstat (limited to 'Modules/ossaudiodev.c')
-rw-r--r--Modules/ossaudiodev.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c
index 3d1f180..d2fd5c8 100644
--- a/Modules/ossaudiodev.c
+++ b/Modules/ossaudiodev.c
@@ -19,6 +19,7 @@
* $Id$
*/
+#define PY_SSIZE_T_CLEAN
#include "Python.h"
#include "structmember.h"
@@ -51,8 +52,8 @@ typedef struct {
char *devicename; /* name of the device file */
int fd; /* file descriptor */
int mode; /* file mode (O_RDONLY, etc.) */
- int icount; /* input count */
- int ocount; /* output count */
+ Py_ssize_t icount; /* input count */
+ Py_ssize_t ocount; /* output count */
uint32_t afmts; /* audio formats supported by hardware */
} oss_audio_t;
@@ -399,13 +400,13 @@ oss_post(oss_audio_t *self, PyObject *args)
static PyObject *
oss_read(oss_audio_t *self, PyObject *args)
{
- int size, count;
+ Py_ssize_t size, count;
PyObject *rv;
if (!_is_fd_valid(self->fd))
return NULL;
- if (!PyArg_ParseTuple(args, "i:read", &size))
+ if (!PyArg_ParseTuple(args, "n:read", &size))
return NULL;
rv = PyBytes_FromStringAndSize(NULL, size);
@@ -427,7 +428,7 @@ static PyObject *
oss_write(oss_audio_t *self, PyObject *args)
{
Py_buffer data;
- int rv;
+ Py_ssize_t rv;
if (!_is_fd_valid(self->fd))
return NULL;
@@ -451,7 +452,7 @@ oss_writeall(oss_audio_t *self, PyObject *args)
Py_buffer data;
const char *cp;
Py_ssize_t size;
- int rv;
+ Py_ssize_t rv;
fd_set write_set_fds;
int select_rv;