Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / flower / file-name.cc

diff --git a/flower/file-name.cc b/flower/file-name.cc
index 787c27f25a2e18fa17fa0d28b58f10218010fbb8..e5736e06b0834ed6c26e15e01f32d25d91682067 100644 (file)
--- a/flower/file-name.cc
+++ b/flower/file-name.cc
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -42,7 +42,7 @@ static string
 dos_to_posix (string file_name)
 {
   char buf[PATH_MAX] = "";
-  char s[PATH_MAX];
+  char s[PATH_MAX] = {0};
   file_name.copy (s, PATH_MAX - 1);
   /* ugh: char const* argument gets modified.  */
   int fail = cygwin_conv_to_posix_path (s, buf);
@@ -74,9 +74,7 @@ dir_name (string const file_name)
   if (n && s[n - 1] == '/')
     s[n - 1] = 0;
   if (s.rfind ('/') != NPOS)
-    {
-      s = s.substr (0, s.rfind ('/'));
-    }
+    s = s.substr (0, s.rfind ('/'));
   else
     s = "";