Merge commit 'origin' into beamlets2

[lilypond.git] / lily / ly-module.cc

diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index c2e96a4a1cf800c62197c085424f6a8460f457ed..eb73cd68cd208babfb4051eec39d6fdcd117335f 100644 (file)
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "lily-guile.hh"
@@ -97,18 +97,20 @@ ly_module_symbols (SCM mod)
 }
 
 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);
@@ -134,9 +136,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;