[xiph-commits] r18358 - in icecast/branches/icecast-webm: . src

[giles at svn.xiph.org]

Author: giles
Date: 2012-06-07 09:51:03 -0700 (Thu, 07 Jun 2012)
New Revision: 18358

Modified:
   icecast/branches/icecast-webm/
   icecast/branches/icecast-webm/src/format_mp3.c
   icecast/branches/icecast-webm/src/fserve.c
Log:
Merge fixes from trunk.



Property changes on: icecast/branches/icecast-webm
___________________________________________________________________
Added: svn:mergeinfo
   + /icecast/trunk/icecast:18296-18357

Modified: icecast/branches/icecast-webm/src/format_mp3.c
===================================================================
--- icecast/branches/icecast-webm/src/format_mp3.c	2012-06-07 16:44:26 UTC (rev 18357)
+++ icecast/branches/icecast-webm/src/format_mp3.c	2012-06-07 16:51:03 UTC (rev 18358)
@@ -620,7 +620,7 @@
             memcpy (meta->data, source_mp3->build_metadata,
                     source_mp3->build_metadata_len);
 
-            DEBUG1("shoutcast metadata %.4080s", meta->data+1);
+	    DEBUG2("shoutcast metadata %.*s", 4080, meta->data+1);
             if (strncmp (meta->data+1, "StreamTitle=", 12) == 0)
             {
                 filter_shoutcast_metadata (source, source_mp3->build_metadata,

Modified: icecast/branches/icecast-webm/src/fserve.c
===================================================================
--- icecast/branches/icecast-webm/src/fserve.c	2012-06-07 16:44:26 UTC (rev 18357)
+++ icecast/branches/icecast-webm/src/fserve.c	2012-06-07 16:51:03 UTC (rev 18358)
@@ -412,7 +412,7 @@
     FILE *file;
 
     fullpath = util_get_path_from_normalised_uri (path);
-    INFO2 ("checking for file %s (%s)", path, fullpath);
+    INFO2 ("checking for file %H (%H)", path, fullpath);
 
     if (strcmp (util_get_extension (fullpath), "m3u") == 0)
         m3u_requested = 1;
@@ -429,7 +429,7 @@
         /* the m3u can be generated, but send an m3u file if available */
         if (m3u_requested == 0 && xslt_playlist_requested == NULL)
         {
-            WARN2 ("req for file \"%s\" %s", fullpath, strerror (errno));
+            WARN2 ("req for file \"%H\" %s", fullpath, strerror (errno));
             client_send_404 (httpclient, "The file you requested could not be found");
             free (fullpath);
             return -1;
@@ -500,7 +500,7 @@
     config = config_get_config();
     if (config->fileserve == 0)
     {
-        DEBUG1 ("on demand file \"%s\" refused", fullpath);
+        DEBUG1 ("on demand file \"%H\" refused", fullpath);
         client_send_404 (httpclient, "The file you requested could not be found");
         config_release_config();
         free (fullpath);
@@ -511,7 +511,7 @@
     if (S_ISREG (file_buf.st_mode) == 0)
     {
         client_send_404 (httpclient, "The file you requested could not be found");
-        WARN1 ("found requested file but there is no handler for it: %s", fullpath);
+        WARN1 ("found requested file but there is no handler for it: %H", fullpath);
         free (fullpath);
         return -1;
     }
@@ -519,7 +519,7 @@
     file = fopen (fullpath, "rb");
     if (file == NULL)
     {
-        WARN1 ("Problem accessing file \"%s\"", fullpath);
+        WARN1 ("Problem accessing file \"%H\"", fullpath);
         client_send_404 (httpclient, "File not readable");
         free (fullpath);
         return -1;