(class Sources): idem.

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 26eafeaf255cb40fdbd886987a1be30476bcffd2..cb851575ba5740edd4bcf46c1f7176aad4b34a87 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -54,7 +54,7 @@ Includable_lexer::new_input (string name, Sources *sources)
       return;
     }
 
-  Source_file *file = sources->get_file (name);
+  Source_file *file = sources->get_file (&name);
   if (!file)
     {
       string msg = _f ("can't find file: `%s'", name);

diff --git a/lily/include/source.hh b/lily/include/source.hh
index 8b3a40fbec469cd4b371580078d68fa038579e53..09c6b0553f4e19d23c196a0de9f763341600c220 100644 (file)
--- a/lily/include/source.hh
+++ b/lily/include/source.hh
@@ -21,7 +21,7 @@ public:
   Sources ();
   ~Sources ();
 
-  Source_file *get_file (string &file_name);
+  Source_file *get_file (string *file_name);
   Source_file *get_sourcefile (char const *);
   void add (Source_file *sourcefile);
   void set_path (File_path *);

diff --git a/lily/source.cc b/lily/source.cc
index c400a2bfa8a2e7ae100abaab4713818d3703329d..002768038c0069a8b33fd2f649dfc35c72655a24 100644 (file)
--- a/lily/source.cc
+++ b/lily/source.cc
@@ -32,22 +32,20 @@ Sources::set_path (File_path *f)
 /**
    open a file
 
-   @param file_string the file to be opened, name might be changed if it
-   is found in a search path. UGH!
-
-   @return 0 if no file found
+   File_string the file to be opened, name might be changed if it is
+   found in a search path.
 */
 Source_file *
-Sources::get_file (string &file_string) //UGH
+Sources::get_file (string *file_string) //UGH
 {
-  if ((file_string != "-") && path_)
+  if (*file_string != "-" && path_)
     {
-      string file_string_o = path_->find (file_string);
-      if ((file_string_o == "") && (file_string != ""))
+      string file_string_o = path_->find (*file_string);
+      if ((file_string_o == "") && (*file_string != ""))
        return 0;
-      file_string = file_string_o;
+      *file_string = file_string_o;
     }
-  Source_file *f = new Source_file (file_string);
+  Source_file *f = new Source_file (*file_string);
   add (f);
   return f;
 }