[xiph-cvs] cvs commit: vorbis-tools/ogg123 buffer.c ogg123.c

[Kenneth C. Arnold]

kcarnold    01/01/14 20:50:24

  Modified:    ogg123   buffer.c ogg123.c
  Log:
  DUH! ogg123 opens the buffer conditionally but closes it unconditionally.
  OOPS!
  
  And buffer.c had an ommission-of-volatile error that caused compiling it
  with optimizations to fail. DUH again.
  
  Please forgive my (temporary, I hope) stupidity.

Revision  Changes    Path
1.2       +1 -1      vorbis-tools/ogg123/buffer.c

Index: buffer.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/buffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buffer.c	2000/12/30 05:44:31	1.1
+++ buffer.c	2001/01/15 04:50:23	1.2
@@ -25,7 +25,7 @@
 }
 
 /* Main write loop. No semaphores. No deadlock. No problem. I hope. */
-void writer_main (buf_t *buf, devices_t *d)
+void writer_main (volatile buf_t *buf, devices_t *d)
 {
   devices_t *d1;
   while (! (buf->status & STAT_SHUTDOWN && buf->reader == buf->writer))

1.19      +3 -2      vorbis-tools/ogg123/ogg123.c

Index: ogg123.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ogg123.c	2000/12/30 05:44:31	1.18
+++ ogg123.c	2001/01/15 04:50:23	1.19
@@ -14,7 +14,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: ogg123.c,v 1.18 2000/12/30 05:44:31 kcarnold Exp $
+ last mod: $Id: ogg123.c,v 1.19 2001/01/15 04:50:23 kcarnold Exp $
 
  ********************************************************************/
 
@@ -253,7 +253,8 @@
         }
     }
 
-    buffer_shutdown (buffer);
+    if (buffer != NULL)
+      buffer_shutdown (buffer);
 
     while (opt.outdevices != NULL) {
       ao_close(opt.outdevices->device);

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.