X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fly-module.cc;h=07fdc531ede2f6adfc0ba5474b58548e1757cc8a;hb=1efe083247345e88e40efc760ca8a1833754aeb3;hp=2ff3915cbf59de1b99cc69dd666ac5b3102930b6;hpb=97aec2781e614b644d797f0380657fb50130d55f;p=lilypond.git

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index 2ff3915cbf..07fdc531ed 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -1,15 +1,26 @@
 /*
-  ly-module.cc -- implement guile module stuff.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "lily-guile.hh"
 #include "warn.hh"
 #include "main.hh"
-#include "string.hh"
+#include "std-string.hh"
 #include "protected-scm.hh"
 
 #ifdef MODULE_GC_KLUDGE
@@ -85,13 +96,7 @@ ly_use_module (SCM mod, SCM used)
 
 #define FUNC_NAME __FUNCTION__
 
-static SCM
-accumulate_symbol (void *closure, SCM key, SCM val, SCM result)
-{
-  (void) closure;
-  (void) val;
-  return scm_cons (key, result);
-}
+
 
 SCM
 ly_module_symbols (SCM mod)
@@ -99,23 +104,24 @@ ly_module_symbols (SCM mod)
   SCM_VALIDATE_MODULE (1, mod);
 
   SCM obarr = SCM_MODULE_OBARRAY (mod);
-  return scm_internal_hash_fold ((Hash_closure_function) & accumulate_symbol,
-				 NULL, SCM_EOL, obarr);
+  return ly_hash_table_keys (obarr);
 }
 
 static SCM
-entry_to_alist (void *closure, SCM key, SCM val, SCM result)
+entry_to_alist (void * /* closure */,
+		SCM key,
+		SCM val,
+		SCM result)
 {
-  (void) closure;
   if (scm_variable_bound_p (val) == SCM_BOOL_T)
     return scm_cons (scm_cons (key, scm_variable_ref (val)), result);
   programming_error ("unbound variable in module");
   return result;
 }
 
-LY_DEFINE (ly_module2alist, "ly:module->alist",
+LY_DEFINE (ly_module_2_alist, "ly:module->alist",
 	   1, 0, 0, (SCM mod),
-	   "Dump the contents of  module @var{mod} as an alist.")
+	   "Dump the contents of module @var{mod} as an alist.")
 {
   SCM_VALIDATE_MODULE (1, mod);
   SCM obarr = SCM_MODULE_OBARRAY (mod);
@@ -141,9 +147,11 @@ ly_reexport_module (SCM mod)
 
 #ifdef MODULE_GC_KLUDGE
 static SCM
-redefine_keyval (void *closure, SCM key, SCM val, SCM result)
+redefine_keyval (void * /* closure */,
+		 SCM key,
+		 SCM val,
+		 SCM result)
 {
-  (void)closure;
   SCM new_tab = result;
   scm_hashq_set_x (new_tab, key, val);
   return new_tab;