Commit 66082000 authored by Karl Heyes's avatar Karl Heyes

minor cleanup

svn path=/trunk/icecast/; revision=5834
parent c3f0d438
...@@ -167,7 +167,6 @@ void config_clear(ice_config_t *c) ...@@ -167,7 +167,6 @@ void config_clear(ice_config_t *c)
nextrelay = relay->next; nextrelay = relay->next;
xmlFree(relay->server); xmlFree(relay->server);
xmlFree(relay->mount); xmlFree(relay->mount);
if(relay->localmount)
xmlFree(relay->localmount); xmlFree(relay->localmount);
free(relay); free(relay);
relay = nextrelay; relay = nextrelay;
...@@ -600,6 +599,8 @@ static void _parse_relay(xmlDocPtr doc, xmlNodePtr node, ...@@ -600,6 +599,8 @@ static void _parse_relay(xmlDocPtr doc, xmlNodePtr node,
if(tmp) xmlFree(tmp); if(tmp) xmlFree(tmp);
} }
} while ((node = node->next)); } while ((node = node->next));
if (relay->localmount == NULL)
relay->localmount = xmlStrdup (relay->mount);
} }
static void _parse_listen_socket(xmlDocPtr doc, xmlNodePtr node, static void _parse_listen_socket(xmlDocPtr doc, xmlNodePtr node,
...@@ -701,6 +702,7 @@ static void _parse_directory(xmlDocPtr doc, xmlNodePtr node, ...@@ -701,6 +702,7 @@ static void _parse_directory(xmlDocPtr doc, xmlNodePtr node,
tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
configuration->yp_url_timeout[configuration->num_yp_directories] = configuration->yp_url_timeout[configuration->num_yp_directories] =
atoi(tmp); atoi(tmp);
if (tmp) xmlFree(tmp);
} else if (strcmp(node->name, "server") == 0) { } else if (strcmp(node->name, "server") == 0) {
_add_server(doc, node->xmlChildrenNode, configuration); _add_server(doc, node->xmlChildrenNode, configuration);
} else if (strcmp(node->name, "touch-interval") == 0) { } else if (strcmp(node->name, "touch-interval") == 0) {
......
...@@ -147,7 +147,7 @@ source_t *source_find_mount_raw(const char *mount) ...@@ -147,7 +147,7 @@ source_t *source_find_mount_raw(const char *mount)
/* Search for mount, if the mount is there but not currently running then /* 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. * this function.
*/ */
source_t *source_find_mount (const char *mount) source_t *source_find_mount (const char *mount)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment