[xiph-commits] r18689 - icecast/branches/ph3/icecast/src

[ph3-der-loewe at svn.xiph.org]

Author: ph3-der-loewe
Date: 2012-11-12 13:35:22 -0800 (Mon, 12 Nov 2012)
New Revision: 18689

Modified:
   icecast/branches/ph3/icecast/src/cfgfile.c
   icecast/branches/ph3/icecast/src/main.c
   icecast/branches/ph3/icecast/src/source.c
Log:
sync with master

Modified: icecast/branches/ph3/icecast/src/cfgfile.c
===================================================================
--- icecast/branches/ph3/icecast/src/cfgfile.c	2012-11-12 21:01:57 UTC (rev 18688)
+++ icecast/branches/ph3/icecast/src/cfgfile.c	2012-11-12 21:35:22 UTC (rev 18689)
@@ -1259,7 +1259,6 @@
     else {
         free (server);
     }
-    
 }
 
 

Modified: icecast/branches/ph3/icecast/src/main.c
===================================================================
--- icecast/branches/ph3/icecast/src/main.c	2012-11-12 21:01:57 UTC (rev 18688)
+++ icecast/branches/ph3/icecast/src/main.c	2012-11-12 21:35:22 UTC (rev 18689)
@@ -436,7 +436,7 @@
     */
     res = _parse_config_opts(argc, argv, filename, 512);
     if (res == 1) {
-#if !defined(_WIN32) || defined(_CONSOLE)
+#if !defined(_WIN32) || defined(_CONSOLE) || defined(__MINGW32__) || defined(__MINGW64__)
         /* startup all the modules */
         initialize_subsystems();
 #endif
@@ -463,7 +463,7 @@
                 _fatal_error("XML config parsing error");
                 break;
             }
-#if !defined(_WIN32) || defined(_CONSOLE)
+#if !defined(_WIN32) || defined(_CONSOLE) || defined(__MINGW32__) || defined(__MINGW64__)
             shutdown_subsystems();
 #endif
             return 1;
@@ -528,7 +528,7 @@
     _server_proc();
 
     INFO0("Shutting down");
-#if !defined(_WIN32) || defined(_CONSOLE)
+#if !defined(_WIN32) || defined(_CONSOLE) || defined(__MINGW32__) || defined(__MINGW64__)
     shutdown_subsystems();
 #endif
     if (pidfile)

Modified: icecast/branches/ph3/icecast/src/source.c
===================================================================
--- icecast/branches/ph3/icecast/src/source.c	2012-11-12 21:01:57 UTC (rev 18688)
+++ icecast/branches/ph3/icecast/src/source.c	2012-11-12 21:35:22 UTC (rev 18689)
@@ -1359,13 +1359,13 @@
     {
         if (mount == NULL || mount[0] != '/')
             break;
-        config = config_get_config();
+        config = config_get_config ();
         len  = strlen (config->webroot_dir) + strlen (mount) + 1;
         path = malloc (len);
         if (path)
             snprintf (path, len, "%s%s", config->webroot_dir, mount);
-        
         config_release_config ();
+
         if (path == NULL)
             break;