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

[Karl Heyes]

karl        04/02/17 10:46:08

  Modified:    src      source.c cfgfile.c
  Log:
  minor cleanup

Revision  Changes    Path
1.70      +1 -1      icecast/src/source.c

Index: source.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/source.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- source.c	17 Feb 2004 00:09:14 -0000	1.69
+++ source.c	17 Feb 2004 15:46:05 -0000	1.70
@@ -147,7 +147,7 @@
 
 
 /* Search for mount, if the mount is there but not currently running then
- * check it's fallback, and so on.  Must have a global source lock to call
+ * check the fallback, and so on.  Must have a global source lock to call
  * this function.
  */
 source_t *source_find_mount (const char *mount)

<p><p>1.9       +4 -2      icecast/src/cfgfile.c

Index: cfgfile.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/cfgfile.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cfgfile.c	29 Jan 2004 01:02:06 -0000	1.8
+++ cfgfile.c	17 Feb 2004 15:46:05 -0000	1.9
@@ -167,8 +167,7 @@
         nextrelay = relay->next;
         xmlFree(relay->server);
         xmlFree(relay->mount);
-        if(relay->localmount)
-            xmlFree(relay->localmount);
+        xmlFree(relay->localmount);
         free(relay);
         relay = nextrelay;
     }
@@ -600,6 +599,8 @@
             if(tmp) xmlFree(tmp);
         }
     } while ((node = node->next));
+    if (relay->localmount == NULL)
+        relay->localmount = xmlStrdup (relay->mount);
 }
 
 static void _parse_listen_socket(xmlDocPtr doc, xmlNodePtr node,
@@ -701,6 +702,7 @@
             tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
             configuration->yp_url_timeout[configuration->num_yp_directories] = 
                 atoi(tmp);
+            if (tmp) xmlFree(tmp);
         } else if (strcmp(node->name, "server") == 0) {
             _add_server(doc, node->xmlChildrenNode, configuration);
         } else if (strcmp(node->name, "touch-interval") == 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.