@@ -400,28 +400,24 @@ static PyObject *
400400oss_read (oss_audio_t * self , PyObject * args )
401401{
402402 int size , count ;
403- char * cp ;
404403 PyObject * rv ;
405404
406405 if (!_is_fd_valid (self -> fd ))
407406 return NULL ;
408407
409408 if (!PyArg_ParseTuple (args , "i:read" , & size ))
410409 return NULL ;
410+
411411 rv = PyBytes_FromStringAndSize (NULL , size );
412412 if (rv == NULL )
413413 return NULL ;
414- cp = PyBytes_AS_STRING (rv );
415-
416- Py_BEGIN_ALLOW_THREADS
417- count = read (self -> fd , cp , size );
418- Py_END_ALLOW_THREADS
419414
420- if ( count < 0 ) {
421- PyErr_SetFromErrno ( PyExc_IOError );
415+ count = _Py_read ( self -> fd , PyBytes_AS_STRING ( rv ), size );
416+ if ( count == -1 ) {
422417 Py_DECREF (rv );
423418 return NULL ;
424419 }
420+
425421 self -> icount += count ;
426422 _PyBytes_Resize (& rv , count );
427423 return rv ;
@@ -440,15 +436,11 @@ oss_write(oss_audio_t *self, PyObject *args)
440436 return NULL ;
441437 }
442438
443- Py_BEGIN_ALLOW_THREADS
444- rv = write ( self -> fd , cp , size );
445- Py_END_ALLOW_THREADS
439+ rv = _Py_write ( self -> fd , cp , size );
440+ if ( rv == -1 )
441+ return NULL ;
446442
447- if (rv == -1 ) {
448- return PyErr_SetFromErrno (PyExc_IOError );
449- } else {
450- self -> ocount += rv ;
451- }
443+ self -> ocount += rv ;
452444 return PyLong_FromLong (rv );
453445}
454446
@@ -486,24 +478,26 @@ oss_writeall(oss_audio_t *self, PyObject *args)
486478 Py_BEGIN_ALLOW_THREADS
487479 select_rv = select (self -> fd + 1 , NULL , & write_set_fds , NULL , NULL );
488480 Py_END_ALLOW_THREADS
489- assert (select_rv != 0 ); /* no timeout, can't expire */
481+
482+ assert (select_rv != 0 ); /* no timeout, can't expire */
490483 if (select_rv == -1 )
491484 return PyErr_SetFromErrno (PyExc_IOError );
492485
493- Py_BEGIN_ALLOW_THREADS
494- rv = write (self -> fd , cp , size );
495- Py_END_ALLOW_THREADS
486+ rv = _Py_write (self -> fd , cp , size );
496487 if (rv == -1 ) {
497- if (errno == EAGAIN ) { /* buffer is full, try again */
498- errno = 0 ;
488+ /* buffer is full, try again */
489+ if (errno == EAGAIN ) {
490+ PyErr_Clear ();
499491 continue ;
500- } else /* it's a real error */
501- return PyErr_SetFromErrno (PyExc_IOError );
502- } else { /* wrote rv bytes */
503- self -> ocount += rv ;
504- size -= rv ;
505- cp += rv ;
492+ }
493+ /* it's a real error */
494+ return NULL ;
506495 }
496+
497+ /* wrote rv bytes */
498+ self -> ocount += rv ;
499+ size -= rv ;
500+ cp += rv ;
507501 }
508502 Py_INCREF (Py_None );
509503 return Py_None ;
0 commit comments