[xiph-commits] r9857 - icecast/trunk/icecast/src

[karl at svn.xiph.org]

Author: karl
Date: 2005-08-26 18:01:29 -0700 (Fri, 26 Aug 2005)
New Revision: 9857

Modified:
   icecast/trunk/icecast/src/slave.c
   icecast/trunk/icecast/src/source.c
Log:
minor memory leak, and compiler warning cleanup


Modified: icecast/trunk/icecast/src/slave.c
===================================================================
--- icecast/trunk/icecast/src/slave.c	2005-08-27 00:32:46 UTC (rev 9856)
+++ icecast/trunk/icecast/src/slave.c	2005-08-27 01:01:29 UTC (rev 9857)
@@ -64,8 +64,8 @@
 static thread_type *_slave_thread_id;
 static int slave_running = 0;
 static int update_settings = 0;
-volatile static unsigned int max_interval = 0;
-volatile static int rescan_relays = 0;
+static volatile unsigned int max_interval = 0;
+static volatile int rescan_relays = 0;
 
 relay_server *relay_free (relay_server *relay)
 {

Modified: icecast/trunk/icecast/src/source.c
===================================================================
--- icecast/trunk/icecast/src/source.c	2005-08-27 00:32:46 UTC (rev 9856)
+++ icecast/trunk/icecast/src/source.c	2005-08-27 01:01:29 UTC (rev 9857)
@@ -1214,8 +1214,8 @@
         global_lock();
         global.sources--;
         global_unlock();
+        source_clear_source (source);
         source_free_source (source);
-        client_destroy (client);
         return;
     }
     client->refbuf = old_data->associated;
@@ -1319,6 +1319,7 @@
         if (connection_complete_source (source, 0) < 0)
             break;
         source_client_thread (source);
+        httpp_destroy (parser);
     } while (0);
     if (file)
         fclose (file);