[xiph-commits] r7689 - icecast/branches/kh/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-09-02 18:24:08 -0700 (Thu, 02 Sep 2004)
New Revision: 7689

Modified:
   icecast/branches/kh/icecast/src/stats.c
Log:
stats relay fixup, need to verify


Modified: icecast/branches/kh/icecast/src/stats.c
===================================================================
--- icecast/branches/kh/icecast/src/stats.c	2004-09-02 23:35:13 UTC (rev 7688)
+++ icecast/branches/kh/icecast/src/stats.c	2004-09-03 01:24:08 UTC (rev 7689)
@@ -331,12 +331,13 @@
 
 static stats_event_t *_copy_event(stats_event_t *event)
 {
-    stats_event_t *copy = (stats_event_t *)malloc(sizeof(stats_event_t));
+    stats_event_t *copy = (stats_event_t *)calloc(1, sizeof(stats_event_t));
     if (event->source) 
         copy->source = (char *)strdup(event->source);
     else
         copy->source = NULL;
-    copy->name = (char *)strdup(event->name);
+    if (event->name)
+        copy->name = (char *)strdup(event->name);
     if (event->value)
         copy->value = (char *)strdup(event->value);
     else
@@ -574,7 +575,10 @@
     int ret;
 
     /* send data to the client!!!! */
-    ret = sock_write(con->sock, "EVENT %s %s %s\n", (event->source != NULL) ? event->source : "global", event->name, event->value ? event->value : "null");
+    ret = sock_write(con->sock, "EVENT %s %s %s\n",
+            (event->source != NULL) ? event->source : "global",
+            event->name ? event->name : "null",
+            event->value ? event->value : "null");
 
     return (ret == -1) ? 0 : 1;
 }
@@ -688,7 +692,7 @@
             _free_event(event);
         } else {
             thread_mutex_unlock(&local_event_mutex);
-            thread_cond_wait(&_event_signal_cond);
+            thread_sleep (500000);
             continue;
         }