diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-05-09 15:52:27 (GMT) |
| commit | f95a1b3c53bdd678b64aa608d4375660033460c3 (patch) | |
| tree | a8bee40b1b14e28ff5978ea519f3035a3c399912 /Modules/ossaudiodev.c | |
| parent | bd250300191133d276a71b395b6428081bf825b8 (diff) | |
| download | cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.zip cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.gz cpython-f95a1b3c53bdd678b64aa608d4375660033460c3.tar.bz2 | |
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
Diffstat (limited to 'Modules/ossaudiodev.c')
| -rw-r--r-- | Modules/ossaudiodev.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index 6654d71..5c990ef 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -809,8 +809,8 @@ oss_getattro(oss_audio_t *self, PyObject *nameobj) PyObject * rval = NULL; if (PyUnicode_Check(nameobj)) - name = _PyUnicode_AsString(nameobj); - + name = _PyUnicode_AsString(nameobj); + if (strcmp(name, "closed") == 0) { rval = (self->fd == -1) ? Py_True : Py_False; Py_INCREF(rval); @@ -975,15 +975,15 @@ error1: static struct PyModuleDef ossaudiodevmodule = { - PyModuleDef_HEAD_INIT, - "ossaudiodev", - NULL, - -1, - ossaudiodev_methods, - NULL, - NULL, - NULL, - NULL + PyModuleDef_HEAD_INIT, + "ossaudiodev", + NULL, + -1, + ossaudiodev_methods, + NULL, + NULL, + NULL, + NULL }; PyMODINIT_FUNC @@ -999,10 +999,10 @@ PyInit_ossaudiodev(void) m = PyModule_Create(&ossaudiodevmodule); if (m == NULL) - return NULL; + return NULL; OSSAudioError = PyErr_NewException("ossaudiodev.OSSAudioError", - NULL, NULL); + NULL, NULL); if (OSSAudioError) { /* Each call to PyModule_AddObject decrefs it; compensate: */ Py_INCREF(OSSAudioError); |