[xiph-commits] r8596 - in icecast/trunk/icecast: doc src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-01-03 09:48:54 -0800 (Mon, 03 Jan 2005)
New Revision: 8596

Modified:
   icecast/trunk/icecast/doc/icecast2_yp.html
   icecast/trunk/icecast/src/admin.c
   icecast/trunk/icecast/src/format_ogg.c
Log:
small fixes


Modified: icecast/trunk/icecast/doc/icecast2_yp.html
===================================================================
--- icecast/trunk/icecast/doc/icecast2_yp.html	2005-01-03 17:36:29 UTC (rev 8595)
+++ icecast/trunk/icecast/doc/icecast2_yp.html	2005-01-03 17:48:54 UTC (rev 8596)
@@ -23,9 +23,9 @@
 <p>If icecast has been built with YP support, then the following configuration options control the YP directory settings:</p>
 <pre>
     &lt;directory&gt;
-        &lt;yp-url-timeout&gt;15&lt;yp-url-timeout&gt;
-        &lt;yp-url&gt;http://dir.xiph.org/cgi-bin/yp-cgi&lt;yp-url&gt;
-    &lt;directory&gt;
+        &lt;yp-url-timeout&gt;15&lt;/yp-url-timeout&gt;
+        &lt;yp-url&gt;http://dir.xiph.org/cgi-bin/yp-cgi&lt;/yp-url&gt;
+    &lt;/directory&gt;
 </pre>
 <p>Multiple directory XML chunks can be specified in order to be listed in multiple directories.</p>
 <br />

Modified: icecast/trunk/icecast/src/admin.c
===================================================================
--- icecast/trunk/icecast/src/admin.c	2005-01-03 17:36:29 UTC (rev 8595)
+++ icecast/trunk/icecast/src/admin.c	2005-01-03 17:48:54 UTC (rev 8596)
@@ -651,7 +651,7 @@
             xmlNewChild(listenernode, NULL, "UserAgent", "Unknown");
         }
         memset(buf, '\000', sizeof(buf));
-        snprintf(buf, sizeof(buf)-1, "%ld", now - current->con->con_time);
+        snprintf(buf, sizeof(buf), "%lu", (unsigned long)(now - current->con->con_time));
         xmlNewChild(listenernode, NULL, "Connected", buf);
         memset(buf, '\000', sizeof(buf));
         snprintf(buf, sizeof(buf)-1, "%lu", current->con->id);

Modified: icecast/trunk/icecast/src/format_ogg.c
===================================================================
--- icecast/trunk/icecast/src/format_ogg.c	2005-01-03 17:36:29 UTC (rev 8595)
+++ icecast/trunk/icecast/src/format_ogg.c	2005-01-03 17:48:54 UTC (rev 8596)
@@ -241,7 +241,7 @@
     char *title = ogg_info->title;
     char *artist = ogg_info->artist;
     char *metadata = NULL;
-    unsigned int len = 0;
+    unsigned int len = 1; /* space for the nul byte at least */
     ogg_codec_t *codec;
     char codec_names [100] = "";