Corrected syntax and removed readline definition

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@363 e10066b5-e1e2-0310-b819-94efdf66514b

1 files changed, 2 insertions, 18 deletions

diff --git a/vdr_setup.c b/vdr_setup.c
index 093cf98..8e281cd 100644
--- a/vdr_setup.c
+++ b/vdr_setup.c
@@ -24,7 +24,6 @@
 
 mgSetup the_setup;
 
-char *readline(FILE *f);
 std::string GdFindFile( std::string mp3file, std::string ToplevelDir );
 
 // --- mgMenuSetup -----------------------------------------------------------
@@ -102,32 +101,17 @@ mgSetup::getFilename( std::string basename )
     }
   else
     {
-      return string( ToplevelDir ) + basename;
+      return std::string( ToplevelDir ) + basename;
     }
 }
 
-#define MAXPARSEBUFFER 1024
-
-char *readline(FILE *f)
-{
-  static char buffer[MAXPARSEBUFFER];
-  if (fgets(buffer, sizeof(buffer), f) > 0) 
-    {
-      int l = strlen(buffer) - 1;
-      if (l >= 0 && buffer[l] == '\n')
-        buffer[l] = 0;
-      return buffer;
-    }
-  return NULL;
-}
-
 #define FINDCMD      "cd '%s' && find -follow -name '%s' 2> /dev/null"
 
 std::string GdFindFile( std::string mp3file, std::string tld )
 {
   std::string fullname = "";
   char *cmd = NULL;
-  asprintf( &cmd, FINDCMD, ToplevelDir.c_str(), mp3file.c_str() );
+  asprintf( &cmd, FINDCMD, tld.c_str(), mp3file.c_str() );
   FILE *p = popen( cmd, "r" );
   if (p) 
     {