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

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2004-10-26 07:21:36 -0700 (Tue, 26 Oct 2004)
New Revision: 8104

Modified:
   icecast/trunk/icecast/src/format.h
   icecast/trunk/icecast/src/source.c
   icecast/trunk/icecast/src/xslt.c
   icecast/trunk/icecast/src/xslt.h
Log:
small cleanups. fix buffer sizing, const and unused struct member


Modified: icecast/trunk/icecast/src/format.h
===================================================================
--- icecast/trunk/icecast/src/format.h	2004-10-26 07:36:28 UTC (rev 8103)
+++ icecast/trunk/icecast/src/format.h	2004-10-26 14:21:36 UTC (rev 8104)
@@ -40,11 +40,6 @@
 
     char *format_description;
 
-    /* set this is the data format has a header that
-    ** we must send before regular data
-    */
-    int has_predata;
-
     refbuf_t *(*get_buffer)(struct source_tag *);
     int (*write_buf_to_client)(struct _format_plugin_tag *format, client_t *client);
     void (*write_buf_to_file)(struct source_tag *source, refbuf_t *refbuf);

Modified: icecast/trunk/icecast/src/source.c
===================================================================
--- icecast/trunk/icecast/src/source.c	2004-10-26 07:36:28 UTC (rev 8103)
+++ icecast/trunk/icecast/src/source.c	2004-10-26 14:21:36 UTC (rev 8104)
@@ -813,10 +813,10 @@
         }
         if (len)
         {
-            char name[100], value[100];
+            char name[100], value[200];
             char *esc;
 
-            sscanf (start, "%199[^=]=%199[^;\r\n]", name, value);
+            sscanf (start, "%99[^=]=%199[^;\r\n]", name, value);
             esc = util_url_unescape (value);
             if (esc)
             {

Modified: icecast/trunk/icecast/src/xslt.c
===================================================================
--- icecast/trunk/icecast/src/xslt.c	2004-10-26 07:36:28 UTC (rev 8103)
+++ icecast/trunk/icecast/src/xslt.c	2004-10-26 14:21:36 UTC (rev 8104)
@@ -100,7 +100,7 @@
     return oldest;
 }
 
-static xsltStylesheetPtr xslt_get_stylesheet(char *fn) {
+static xsltStylesheetPtr xslt_get_stylesheet(const char *fn) {
     int i;
     int empty = -1;
     struct stat file;
@@ -147,7 +147,7 @@
     return cache[i].stylesheet;
 }
 
-void xslt_transform(xmlDocPtr doc, char *xslfilename, client_t *client)
+void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client)
 {
     xmlOutputBufferPtr outputBuffer;
     xmlDocPtr    res;

Modified: icecast/trunk/icecast/src/xslt.h
===================================================================
--- icecast/trunk/icecast/src/xslt.h	2004-10-26 07:36:28 UTC (rev 8103)
+++ icecast/trunk/icecast/src/xslt.h	2004-10-26 14:21:36 UTC (rev 8104)
@@ -34,7 +34,7 @@
 #include "stats.h"
 
 
-void xslt_transform(xmlDocPtr doc, char *xslfilename, client_t *client);
+void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client);
 void xslt_initialize();
 void xslt_shutdown();