1
0
Fork 0
forked from len0rd/rockbox

pdbox: Rewrote recently added bugfixes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26184 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Wincent Balin 2010-05-20 04:23:40 +00:00
parent ae2659e633
commit c208486fcc
2 changed files with 8 additions and 5 deletions

View file

@ -1264,7 +1264,7 @@ static void garray_read16(t_garray *x, t_symbol *filename,
for (i = 0; i < nelem; i++) for (i = 0; i < nelem; i++)
{ {
#ifdef ROCKBOX #ifdef ROCKBOX
if(read(fd, &s, sizeof(s)) < (ssize_t) (1 * sizeof(s))) if(read(fd, &s, sizeof(s)) < (ssize_t) sizeof(s))
#else #else
if (fread(&s, sizeof(s), 1, fd) < 1) if (fread(&s, sizeof(s), 1, fd) < 1)
#endif #endif
@ -1413,7 +1413,7 @@ static void garray_write16(t_garray *x, t_symbol *filename, t_symbol *format)
} }
memcpy((void *)(waveheader + 40), (void *)(&intbuf), 4); memcpy((void *)(waveheader + 40), (void *)(&intbuf), 4);
#ifdef ROCKBOX #ifdef ROCKBOX
if(write(fd, waveheader, sizeof(waveheader)) < (ssize_t) (1 * sizeof(waveheader))) if(write(fd, waveheader, sizeof(waveheader)) < (ssize_t) sizeof(waveheader))
#else #else
if (fwrite(waveheader, sizeof(waveheader), 1, fd) < 1) if (fwrite(waveheader, sizeof(waveheader), 1, fd) < 1)
#endif #endif
@ -1434,7 +1434,7 @@ static void garray_write16(t_garray *x, t_symbol *filename, t_symbol *format)
xxx = foo[0]; foo[0] = foo[1]; foo[1] = xxx; xxx = foo[0]; foo[0] = foo[1]; foo[1] = xxx;
} }
#ifdef ROCKBOX #ifdef ROCKBOX
if(write(fd, &sh, sizeof(sh)) < (ssize_t) (1 * sizeof(sh))) if(write(fd, &sh, sizeof(sh)) < (ssize_t) sizeof(sh))
#else #else
if (fwrite(&sh, sizeof(sh), 1, fd) < 1) if (fwrite(&sh, sizeof(sh), 1, fd) < 1)
#endif #endif

View file

@ -754,6 +754,7 @@ int binbuf_write(t_binbuf *x, char *filename, char *dir, int crflag)
{ {
#ifdef ROCKBOX #ifdef ROCKBOX
int f = 0; int f = 0;
ssize_t bp_size;
#else /* ROCKBOX */ #else /* ROCKBOX */
FILE *f = 0; FILE *f = 0;
#endif /* ROCKBOX */ #endif /* ROCKBOX */
@ -799,7 +800,8 @@ int binbuf_write(t_binbuf *x, char *filename, char *dir, int crflag)
if (ep - bp < length) if (ep - bp < length)
{ {
#ifdef ROCKBOX #ifdef ROCKBOX
if(write(f, sbuf, bp-sbuf) < 1 * (bp-sbuf)) bp_size = bp - sbuf;
if(write(f, sbuf, bp_size) < bp_size)
#else /* ROCKBOX */ #else /* ROCKBOX */
if (fwrite(sbuf, bp-sbuf, 1, f) < 1) if (fwrite(sbuf, bp-sbuf, 1, f) < 1)
#endif /* ROCKBOX */ #endif /* ROCKBOX */
@ -830,7 +832,8 @@ int binbuf_write(t_binbuf *x, char *filename, char *dir, int crflag)
} }
} }
#ifdef ROCKBOX #ifdef ROCKBOX
if(write(f, sbuf, bp-sbuf) < 1 * (bp-sbuf)) bp_size = bp - sbuf;
if(write(f, sbuf, bp_size) < bp_size)
#else /* ROCKBOX */ #else /* ROCKBOX */
if (fwrite(sbuf, bp-sbuf, 1, f) < 1) if (fwrite(sbuf, bp-sbuf, 1, f) < 1)
#endif /* ROCKBOX */ #endif /* ROCKBOX */