sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix error introduced in last commit: Can't call ferror AFTER closing file

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-23 08:40:36 -06:00
parent c692ca4238
commit 19bd59a6ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/nxplayer/nxplayer.c
View File

@ -500,6 +500,9 @@ static int nxplayer_enqueuebuffer(FAR struct nxplayer_s *pPlayer,
pBuf->nbytes = fread(&pBuf->samp, 1, pBuf->nmaxbytes, pPlayer->fileFd); pBuf->nbytes = fread(&pBuf->samp, 1, pBuf->nmaxbytes, pPlayer->fileFd);
if (pBuf->nbytes < pBuf->nmaxbytes) if (pBuf->nbytes < pBuf->nmaxbytes)
{ {
int errcode = errno;
int readerror = ferror(pPlayer->fileFd);
/* End of file or read error.. We are finished with this file in any /* End of file or read error.. We are finished with this file in any
* event. * event.
*/ */
@ -509,9 +512,8 @@ static int nxplayer_enqueuebuffer(FAR struct nxplayer_s *pPlayer,
/* Was this a file read error */ /* Was this a file read error */
if (ferror(pPlayer->fileFd)) if (pBuf->nbytes == 0 && readerror)
{ {
int errcode = errno;
DEBUGASSERT(errcode > 0); DEBUGASSERT(errcode > 0);
auddbg("ERROR: fread failed: %d\n", errcode); auddbg("ERROR: fread failed: %d\n", errcode);