[Sox-commits] sox/src adpcms.c, 1.17, 1.18 au.c, 1.88, 1.89 cvsd.c, 1.46, 1.47 hcom.c, 1.60, 1.61 lpc10.c, 1.10, 1.11 tx16w.c, 1.44, 1.45

[robs <ro...@us...>]

Update of /cvsroot/sox/sox/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv8152

Modified Files:
	adpcms.c au.c cvsd.c hcom.c lpc10.c tx16w.c 
Log Message:
use sox_read_b_buf when expect to hit EOF

Index: au.c
===================================================================
RCS file: /cvsroot/sox/sox/src/au.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- au.c	16 Mar 2008 07:52:57 -0000	1.88
+++ au.c	16 Mar 2008 20:51:03 -0000	1.89
@@ -97,7 +97,7 @@
   unsigned char           in_byte;
 
   if (p->in_bits < (int)ft->encoding.bits_per_sample) {
-    if (sox_readb(ft, &in_byte) == SOX_EOF) {
+    if (sox_read_b_buf(ft, &in_byte, 1) != 1) {
       *code = 0;
       return -1;
     }

Index: hcom.c
===================================================================
RCS file: /cvsroot/sox/sox/src/hcom.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- hcom.c	9 Mar 2008 20:38:29 -0000	1.60
+++ hcom.c	16 Mar 2008 20:51:03 -0000	1.61
@@ -161,7 +161,6 @@
                         return 0; /* Don't know if this can happen... */
                 if (sox_readb(ft, &sample_rate) == SOX_EOF)
                 {
-                        sox_fail_errno(ft,SOX_EOF,"unexpected EOF at start of HCOM data");
                         return (0);
                 }
                 p->sample = sample_rate;

Index: cvsd.c
===================================================================
RCS file: /cvsroot/sox/sox/src/cvsd.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cvsd.c	3 Mar 2008 19:20:09 -0000	1.46
+++ cvsd.c	16 Mar 2008 20:51:03 -0000	1.47
@@ -234,7 +234,7 @@
         
         while (done < nsamp) {
                 if (!p->bit.cnt) {
-                        if (sox_readb(ft, &(p->bit.shreg)) == SOX_EOF)
+                        if (sox_read_b_buf(ft, &(p->bit.shreg), 1) != 1)
                                 return done;
                         p->bit.cnt = 8;
                         p->bit.mask = 1;

Index: lpc10.c
===================================================================
RCS file: /cvsroot/sox/sox/src/lpc10.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lpc10.c	9 Mar 2008 20:38:29 -0000	1.10
+++ lpc10.c	16 Mar 2008 20:51:03 -0000	1.11
@@ -104,7 +104,7 @@
   /* Unpack the array bits into coded_frame. */
   for (i = 0; i < len; i++) {
     if (i % 8 == 0) {
-      sox_readb(ft, &c);
+      sox_read_b_buf(ft, &c, 1);
       if (sox_eof(ft)) {
         return (i);
       }

Index: tx16w.c
===================================================================
RCS file: /cvsroot/sox/sox/src/tx16w.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- tx16w.c	9 Mar 2008 20:38:30 -0000	1.44
+++ tx16w.c	16 Mar 2008 20:51:03 -0000	1.45
@@ -90,7 +90,7 @@
     }
 
     /* This is dumb but portable, just count the bytes til EOF */
-    while (sox_readb(ft, (unsigned char *)&trash) != SOX_EOF)
+    while (sox_read_b_buf(ft, (unsigned char *)&trash, 1) == 1)
         num_samp_bytes++; 
     num_samp_bytes -= 32;         /* calculate num samples by sub header size */
     sox_seeki(ft, 0, 0);           /* rewind file */

Index: adpcms.c
===================================================================
RCS file: /cvsroot/sox/sox/src/adpcms.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- adpcms.c	9 Mar 2008 20:38:29 -0000	1.17
+++ adpcms.c	16 Mar 2008 20:51:03 -0000	1.18
@@ -194,7 +194,7 @@
     state->store.flag = 0;
     ++n;
   }
-  while (n < len && sox_readb(ft, &byte) == SOX_SUCCESS) {
+  while (n < len && sox_read_b_buf(ft, &byte, 1) == 1) {
     word = adpcm_decode(byte >> 4, &state->encoder);
     *buffer++ = SOX_SIGNED_16BIT_TO_SAMPLE(word, ft->clips);