X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring-smob.cc;h=1ab1507fbf5ce02fdf2b44a8dad0c4409485587b;hb=5bc7291f11b6fb4cc2f123bba00b4f6cce8c0d1c;hp=591953b0359cf6c175a22c400490f1b8e84cad92;hpb=7949941eb50f6243b76ded2dd331501027b68448;p=lilypond.git

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index 591953b035..1ab1507fbf 100644
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -1,11 +1,10 @@
-/*   
-  spring.cc --  implement Spring
-  
+/*
+  spring.cc -- implement Spring
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "spring.hh"
 #include "warn.hh"
@@ -13,29 +12,32 @@
 
 Spring_smob::Spring_smob ()
 {
-  distance_ =0.;
-  strength_ =1.0;
+  distance_ = 0.;
+  inverse_strength_ = 1.0;
   expand_only_b_ = false;
   other_ = 0;
 }
 
-
 IMPLEMENT_SIMPLE_SMOBS (Spring_smob);
 
 SCM
-Spring_smob::mark_smob (SCM) { return SCM_UNSPECIFIED; }
+Spring_smob::mark_smob (SCM x)
+{
+  (void)x;
+
+  return SCM_UNSPECIFIED;
+}
 
 int
-Spring_smob::print_smob (SCM s, SCM p, scm_print_state *)
+Spring_smob::print_smob (SCM, SCM p, scm_print_state *)
 {
-  Spring_smob *ss = unsmob_spring (s);
-  scm_puts (_f ("#<spring smob d= %f>", ss->distance_).to_str0 (), p);
+  scm_puts ("#<Spring smob>", p);
   return 1;
 }
 
 SCM
-Spring_smob::equal_p (SCM a , SCM b)
+Spring_smob::equal_p (SCM a, SCM b)
 {
-  return a==b? SCM_BOOL_T : SCM_BOOL_F;
+  return a == b? SCM_BOOL_T : SCM_BOOL_F;
 }