Build: Target version.itexi and weblinks.itexi (issue 3576).

[lilypond.git] / lily / source-file.cc

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 88ee243630b46457b6b50c36ac4f32e54bc225b9..26426ae8af1e80824e2626f41c1ff1449e134d99 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -55,7 +55,7 @@ Source_file::load_stdin ()
   return contents of FILENAME. *Not 0-terminated!*
  */
 vector<char>
-gulp_file (string filename, int desired_size)
+gulp_file (const string &filename, int desired_size)
 {
   /* "b" must ensure to open literally, avoiding text (CR/LF)
      conversions.  */
@@ -106,7 +106,7 @@ Source_file::init ()
   smobify_self ();
 }
 
-Source_file::Source_file (string filename, string data)
+Source_file::Source_file (const string &filename, const string &data)
 {
   init ();
 
@@ -124,7 +124,7 @@ Source_file::Source_file (string filename, string data)
       newline_locations_.push_back (&characters_[0] + i);
 }
 
-Source_file::Source_file (string filename_string)
+Source_file::Source_file (const string &filename_string)
 {
   init ();
 
@@ -182,7 +182,7 @@ Source_file::file_line_column_string (char const *context_str0) const
       get_counts (context_str0, &l, &ch, &col, &offset);
 
       return name_string () + ":" + to_string (l)
-             + ":" + to_string (col);
+             + ":" + to_string (col + 1);
     }
 }
 
@@ -290,7 +290,7 @@ Source_file::get_counts (char const *pos_str0,
       // called in mid-character, the results are somewhat arbitrary,
       // but there is no really sane definition anyway.
       if ((*line_chars & 0xc0) == 0x80)
-       continue;
+        continue;
 
       if (*line_chars == '\t')
         (*column) = (*column / 8 + 1) * 8;