[xiph-cvs] cvs commit: icecast/src source.c

[Michael Smith]

msmith      01/10/21 03:07:51

  Modified:    .        configure.in
               src      source.c
  Log:
  configure.in: solaris requires -D_REENTRANT. What about other platforms?
  source.c: fix bug in handling non-fatal errors like EAGAIN

Revision  Changes    Path
1.4       +6 -6      icecast/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/icecast/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in	2001/10/20 21:28:08	1.3
+++ configure.in	2001/10/21 10:07:51	1.4
@@ -17,9 +17,9 @@
                 PROFILE="-p -g3 -O2 -signed"
                 ;;
         sparc-sun-solaris*)
-                DEBUG="-v -g"
-                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
-                PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
+                DEBUG="-v -g -D_REENTRANT"
+                CFLAGS="-xO4 -fast -w -fsimple -native -xcg92 -D_REENTRANT"
+                PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc -D_REENTRANT"
                 ;;
         *)
                 DEBUG="-g"
@@ -35,9 +35,9 @@
                 PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char -D_REENTRANT -D_GNU_SOURCE"
                 ;;
         sparc-sun-*)
-                DEBUG="-g -Wall -fsigned-char -mv8"
-                CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
-                PROFILE="-pg -g -O20 -fsigned-char -mv8" 
+                DEBUG="-g -Wall -fsigned-char -mv8 -D_REENTRANT"
+                CFLAGS="-O20 -ffast-math -fsigned-char -mv8 -D_REENTRANT"
+                PROFILE="-pg -g -O20 -fsigned-char -mv8 -D_REENTRANT" 
                 ;;
         *)
                 DEBUG="-g -Wall -fsigned-char"

1.3       +2 -2      icecast/src/source.c

Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- source.c	2001/10/20 06:43:04	1.2
+++ source.c	2001/10/21 10:07:51	1.3
@@ -190,7 +190,7 @@
                                                 client->con->error = 1;
                                         } else {
                                                 printf("SOURCE: client had recoverable error...\n");
-						client->pos += sbytes;
+						client->pos += sbytes>0?sbytes:0;
                                                 /* put the refbuf back on top of the queue, since we didn't finish with it */
                                                 refbuf_queue_insert(&client->queue, abuf);
                                         }
@@ -220,7 +220,7 @@
                                                 client->con->error = 1;
                                         } else {
                                                 printf("SOURCE: recoverable error %ld\n", bytes);
-						client->pos = sbytes;
+						client->pos = sbytes>0?sbytes:0;
                                                 refbuf_addref(refbuf);
                                                 refbuf_queue_insert(&client->queue, refbuf);
                                         }

--- >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.