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

Karl Heyes karl at xiph.org
Tue Jan 27 18:18:11 PST 2004



karl        04/01/27 21:18:08

  Modified:    src      admin.c
  Log:
  oops, missed these from previous commit, the lock is now taken further up

Revision  Changes    Path
1.18      +2 -7      icecast/src/admin.c

Index: admin.c
===================================================================
RCS file: /usr/local/cvsroot/icecast/src/admin.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- admin.c	28 Jan 2004 01:22:36 -0000	1.17
+++ admin.c	28 Jan 2004 02:17:57 -0000	1.18
@@ -165,8 +165,6 @@
         xmlNewChild(xmlnode, NULL, "current_source", current_source);
     }
 
-    avl_tree_rlock(global.source_tree);
-
     node = avl_get_first(global.source_tree);
     while(node) {
         source = (source_t *)node->key;
@@ -186,7 +184,6 @@
             source->format->format_description);
         node = avl_get_next(node);
     }
-    avl_tree_unlock(global.source_tree);
     return(doc);
 }
 
@@ -700,9 +697,8 @@
     DEBUG0("List mounts request");
 
 
-    if (response == PLAINTEXT) {
-        avl_tree_rlock(global.source_tree);
-
+    if (response == PLAINTEXT)
+    {
         node = avl_get_first(global.source_tree);
                 html_write(client, 
             "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n");
@@ -711,7 +707,6 @@
             html_write(client, "%s\n", source->mount);
             node = avl_get_next(node);
         }
-        avl_tree_unlock(global.source_tree);
     }
     else {
 

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



More information about the commits mailing list