[xiph-cvs] cvs commit: ices/src config.c stream.c

[Michael Smith]

msmith      02/08/09 23:31:28

  Modified:    src      config.c stream.c
  Log:
  More minor cleanups.

Revision  Changes    Path
1.11      +4 -2      ices/src/config.c

Index: config.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- config.c	3 Aug 2002 08:14:54 -0000	1.10
+++ config.c	10 Aug 2002 03:31:27 -0000	1.11
@@ -1,7 +1,7 @@
 /* config.c
  * - config file reading code, plus default settings.
  *
- * $Id: config.c,v 1.10 2002/08/03 08:14:54 msmith Exp $
+ * $Id: config.c,v 1.11 2002/08/10 03:31:27 msmith Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -17,8 +17,8 @@
 #include <time.h>
 
 /* these might need tweaking for other systems */
-#include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 
 #include "thread.h"
 
@@ -365,6 +365,7 @@
         ices_config = (config_t *)calloc(1, sizeof(config_t));
         _set_defaults(ices_config);
         srand(time(NULL));
+    xmlInitParser();
 }
 
 void config_shutdown(void)
@@ -385,6 +386,7 @@
 
         free(ices_config);
         ices_config = NULL;
+    xmlCleanupParser();
 }
 
 int config_read(const char *fn)

<p><p>1.16      +3 -3      ices/src/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- stream.c	9 Aug 2002 15:02:33 -0000	1.15
+++ stream.c	10 Aug 2002 03:31:27 -0000	1.16
@@ -1,7 +1,7 @@
 /* stream.c
  * - Core streaming functions/main loop.
  *
- * $Id: stream.c,v 1.15 2002/08/09 15:02:33 msmith Exp $
+ * $Id: stream.c,v 1.16 2002/08/10 03:31:27 msmith Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -214,8 +214,8 @@
             /* Non-fatal shout error */
             else if(ret == 0)
                         {
-				LOG_ERROR1("Send error: %s", 
-                        shout_get_error(sdsc->shout));
+				LOG_ERROR2("Send error: %s (%s)", 
+                        shout_get_error(sdsc->shout), strerror(errno));
                                 if(shout_get_errno(sdsc->shout) == SHOUTERR_SOCKET)
                                 {
                                         int i=0;

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