From a7ded22f9aa8a75339087d8a398ff64c9f9433ad Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 16 Feb 2006 12:16:34 +0000
Subject: [PATCH] (class Sources): idem.

---
 lily/includable-lexer.cc |  2 +-
 lily/include/source.hh   |  2 +-
 lily/source.cc           | 18 ++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 26eafeaf25..cb851575ba 100644
--- 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 8b3a40fbec..09c6b0553f 100644
--- 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 c400a2bfa8..002768038c 100644
--- 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;
 }
-- 
2.39.2