[xiph-commits] r9691 - icecast/trunk/ices/src

[msmith at svn.xiph.org]

Author: msmith
Date: 2005-08-02 08:01:21 -0700 (Tue, 02 Aug 2005)
New Revision: 9691

Modified:
   icecast/trunk/ices/src/input.c
Log:
Give a clearer error message if an input module couldn't be found (as distinct
from it being found but failing to initialise)


Modified: icecast/trunk/ices/src/input.c
===================================================================
--- icecast/trunk/ices/src/input.c	2005-08-02 02:45:35 UTC (rev 9690)
+++ icecast/trunk/ices/src/input.c	2005-08-02 15:01:21 UTC (rev 9691)
@@ -280,6 +280,7 @@
     int valid_stream = 1;
     int inc_count;
     int not_waiting_for_critical;
+    int foundmodule = 0;
 
     thread_cond_create(&ices_config->queue_cond);
     thread_cond_create(&ices_config->event_pending_cond);
@@ -292,6 +293,7 @@
     {
         if(!strcmp(ices_config->playlist_module, modules[current_module].name))
         {
+            foundmodule = 1;
             inmod = modules[current_module].open(ices_config->module_params);
             break;
         }
@@ -300,8 +302,12 @@
 
     if(!inmod)
     {
-        LOG_ERROR1("Couldn't initialise input module \"%s\"", 
-                ices_config->playlist_module);
+        if(foundmodule)
+            LOG_ERROR1("Couldn't initialise input module \"%s\"", 
+                    ices_config->playlist_module);
+        else
+            LOG_ERROR1("No input module named \"%s\" could be found", 
+                    ices_config->playlist_module);
         return;
     }