mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2025-01-03 14:56:34 -05:00
oops, missed these from previous commit, the lock is now taken further up
svn path=/trunk/icecast/; revision=5789
This commit is contained in:
parent
87da84a021
commit
c9d6c049ef
@ -165,8 +165,6 @@ xmlDocPtr admin_build_sourcelist(char *current_source)
|
|||||||
xmlNewChild(xmlnode, NULL, "current_source", current_source);
|
xmlNewChild(xmlnode, NULL, "current_source", current_source);
|
||||||
}
|
}
|
||||||
|
|
||||||
avl_tree_rlock(global.source_tree);
|
|
||||||
|
|
||||||
node = avl_get_first(global.source_tree);
|
node = avl_get_first(global.source_tree);
|
||||||
while(node) {
|
while(node) {
|
||||||
source = (source_t *)node->key;
|
source = (source_t *)node->key;
|
||||||
@ -186,7 +184,6 @@ xmlDocPtr admin_build_sourcelist(char *current_source)
|
|||||||
source->format->format_description);
|
source->format->format_description);
|
||||||
node = avl_get_next(node);
|
node = avl_get_next(node);
|
||||||
}
|
}
|
||||||
avl_tree_unlock(global.source_tree);
|
|
||||||
return(doc);
|
return(doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -700,9 +697,8 @@ static void command_list_mounts(client_t *client, int response) {
|
|||||||
DEBUG0("List mounts request");
|
DEBUG0("List mounts request");
|
||||||
|
|
||||||
|
|
||||||
if (response == PLAINTEXT) {
|
if (response == PLAINTEXT)
|
||||||
avl_tree_rlock(global.source_tree);
|
{
|
||||||
|
|
||||||
node = avl_get_first(global.source_tree);
|
node = avl_get_first(global.source_tree);
|
||||||
html_write(client,
|
html_write(client,
|
||||||
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n");
|
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n");
|
||||||
@ -711,7 +707,6 @@ static void command_list_mounts(client_t *client, int response) {
|
|||||||
html_write(client, "%s\n", source->mount);
|
html_write(client, "%s\n", source->mount);
|
||||||
node = avl_get_next(node);
|
node = avl_get_next(node);
|
||||||
}
|
}
|
||||||
avl_tree_unlock(global.source_tree);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user