Fix almost all warnings in flower/ and many in lily/.

Most of the remaining warnings are about vsize -> int casting,
where I'll have to find a proper solution (we don't want to cast
all appearances of vsize to int explicitly, but rather use vsize
wherever possible).

diff --git a/flower/cpu-timer.cc b/flower/cpu-timer.cc
index a72d5fe7ba797082ce9d78b1147004f902be526a..bc95e4b45b5fe05d6eae0789e3336e43df7fb0ed 100644 (file)
--- a/flower/cpu-timer.cc
+++ b/flower/cpu-timer.cc
@@ -45,5 +45,5 @@ Real
 Cpu_timer::read ()
 {
   clock_t stop = clock ();
-  return (stop - start_clock_) / Real (CLOCKS_PER_SEC);
+  return Real (stop - start_clock_) / Real (CLOCKS_PER_SEC);
 }

diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc
index 39e76e35169710ee13c616f9b38d3d3c6811992e..90aa5c908d0906e320d61116f8525b52db0b484a 100644 (file)
--- a/flower/file-cookie.cc
+++ b/flower/file-cookie.cc
@@ -23,14 +23,14 @@ extern "C" {
     return (FILE *) cookie;
   }
 
-  int
+  ssize_t
   lily_cookie_fclose (void *file)
   {
     assert (is_memory_stream (file));
     return Memory_out_stream::cleaner (file);
   }
 
-  int
+  ssize_t
   lily_cookie_fprintf (void *file, char const *format, ...)
   {
     assert (is_memory_stream (file));
@@ -45,7 +45,7 @@ extern "C" {
     return Memory_out_stream::writer (file, buf, i);
   }
 
-  int
+  ssize_t
   lily_cookie_putc (int c, void *file)
   {
     assert (is_memory_stream (file));

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 915509b272882cfb43d6fed9fb050a9624b75fd9..dbabcbcf08111e6ea5f9193b925296193b2e9f42 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -54,7 +54,7 @@ Getopt_long::parselong ()
   assert (*optnm);
 
   char const *endopt = strchr (optnm, '=');
-  int searchlen = (endopt) ? endopt - optnm : strlen (optnm);
+  size_t searchlen = (endopt) ? endopt - optnm : strlen (optnm);
 
   found_option_ = 0;
   for (int i = 0; i < table_len_; i++)

diff --git a/flower/include/file-cookie.hh b/flower/include/file-cookie.hh
index 462ec6045baa97fee0e8402f9c30080c70ea16bd..6bdb2366992887f45a57fdc17af68fd580111cfc 100644 (file)
--- a/flower/include/file-cookie.hh
+++ b/flower/include/file-cookie.hh
@@ -15,17 +15,17 @@ extern "C" {
   {
     ssize_t (*read) (void *, char *, size_t);
     ssize_t (*write) (void *, char const *, size_t);
-    int (*seek) (void *, off64_t *, int);
-    int (*close) (void *);
+    ssize_t (*seek) (void *, off64_t *, size_t);
+    ssize_t (*close) (void *);
   } lily_cookie_io_functions_t;
 
   void *lily_fopencookie (void *cookie, char const *modes,
                           lily_cookie_io_functions_t io_funcs);
 
-  int lily_cookie_fclose (void *);
-  int lily_cookie_fprintf (void *file, char const *format, ...)
+  ssize_t lily_cookie_fclose (void *);
+  ssize_t lily_cookie_fprintf (void *file, char const *format, ...)
   __attribute__ ((format (printf, 2, 3)));
-  int lily_cookie_putc (int c, void *file);
+  ssize_t lily_cookie_putc (int c, void *file);
 
 #ifdef __cplusplus
 } /* extern "C" */

diff --git a/flower/include/memory-stream.hh b/flower/include/memory-stream.hh
index b4114eccf54aca01ecd09dbf34cc378e86ca8123..9ebe922779a76f7ef50dd5318cb5684528633330 100644 (file)
--- a/flower/include/memory-stream.hh
+++ b/flower/include/memory-stream.hh
@@ -40,8 +40,8 @@ class Memory_out_stream
 public:
   static ssize_t reader (void *, char *, size_t);
   static ssize_t writer (void *, char const *, size_t);
-  static int seeker (void *, off64_t *, int);
-  static int cleaner (void *);
+  static ssize_t seeker (void *, off64_t *, size_t);
+  static ssize_t cleaner (void *);
 
   Memory_out_stream ();
   ~Memory_out_stream ();

diff --git a/flower/include/polynomial.hh b/flower/include/polynomial.hh
index c58cb935004e2d324381f4b8229d949e63ce7960..9563acf50ca0cd1f426e8875b5a54fb502a71617 100644 (file)
--- a/flower/include/polynomial.hh
+++ b/flower/include/polynomial.hh
@@ -32,7 +32,7 @@
 struct Polynomial
 {
   /// degree of polynomial
-  int degree ()const;
+  ssize_t degree ()const;
 
   /// coefficients
   vector<Real> coefs_;

diff --git a/flower/include/string-convert.hh b/flower/include/string-convert.hh
index 55c14866a1785913e4cedfc9896df06844b5580e..148005672ec78698c41ba2bf856b41947e69e254 100644 (file)
--- a/flower/include/string-convert.hh
+++ b/flower/include/string-convert.hh
@@ -19,7 +19,7 @@ class String_convert
   static int hex2nibble (Byte byte);
   static Byte nibble2hex_byte (Byte byte);
 public:
-  static string pad_to (string s, int length);
+  static string pad_to (string s, size_t length);
   static string bool_string (bool b);
   static string bin2dec (string bin_string);
   static string bin2hex (Byte bin_char);
@@ -38,10 +38,11 @@ public:
   static string hex2bin (string str);
   static string int_string (int i, char const *fmt = 0);
   static string unsigned_string (unsigned);
+  static string unsigned_long_string (unsigned long);
   static string long_string (long);
-  static string int2hex (int i, int length_i, char ch);
-  static string unsigned2hex (unsigned u, ssize length, char ch);
-  static string int2dec (int i, int length_i, char ch);
+  static string int2hex (int i, size_t length_i, char ch);
+  static string unsigned2hex (unsigned u, size_t length, char ch);
+  static string int2dec (int i, size_t length_i, char ch);
   static string rational_string (Rational);
   static string pointer_string (void const *);
   static string precision_string (double x, int n);

diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index c72eb53947a6b9c549368cf77d575b9bfb0d0e1e..9d4c747ef5a41e231a4992b3ebf230c71304bdfd 100644 (file)
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -39,7 +39,7 @@ Memory_out_stream::functions_
   Memory_out_stream::cleaner
 };
 
-int
+ssize_t
 Memory_out_stream::cleaner (void *cookie)
 {
   Memory_out_stream *stream = (Memory_out_stream *) cookie;
@@ -122,10 +122,10 @@ Memory_out_stream::reader (void * /* cookie */,
   return 0;
 }
 
-int
+ssize_t
 Memory_out_stream::seeker (void *,
                            off64_t *,
-                           int)
+                           size_t)
 {
   assert (false);
   return 0;

diff --git a/flower/polynomial.cc b/flower/polynomial.cc
index 05faf4209738a164f170ae86485a6e3059e51e24..d95258720d1b5538df7eff9cda70eeb72db641d6 100644 (file)
--- a/flower/polynomial.cc
+++ b/flower/polynomial.cc
@@ -49,11 +49,11 @@ Polynomial::multiply (const Polynomial &p1, const Polynomial &p2)
 {
   Polynomial dest;
 
-  int deg = p1.degree () + p2.degree ();
-  for (int i = 0; i <= deg; i++)
+  ssize_t deg = p1.degree () + p2.degree ();
+  for (ssize_t i = 0; i <= deg; i++)
     {
       dest.coefs_.push_back (0);
-      for (int j = 0; j <= i; j++)
+      for (ssize_t j = 0; j <= i; j++)
         if (i - j <= p2.degree () && j <= p1.degree ())
           dest.coefs_.back () += p1.coefs_[j] * p2.coefs_[i - j];
     }
@@ -177,22 +177,22 @@ Polynomial::set_mod (const Polynomial &u, const Polynomial &v)
 
   if (v.lc () < 0.0)
     {
-      for (int k = u.degree () - v.degree () - 1; k >= 0; k -= 2)
+      for (ssize_t k = u.degree () - v.degree () - 1; k >= 0; k -= 2)
         coefs_[k] = -coefs_[k];
 
-      for (int k = u.degree () - v.degree (); k >= 0; k--)
-        for (int j = v.degree () + k - 1; j >= k; j--)
+      for (ssize_t k = u.degree () - v.degree (); k >= 0; k--)
+        for (ssize_t j = v.degree () + k - 1; j >= k; j--)
           coefs_[j] = -coefs_[j] - coefs_[v.degree () + k] * v.coefs_[j - k];
     }
   else
 
     {
-      for (int k = u.degree () - v.degree (); k >= 0; k--)
-        for (int j = v.degree () + k - 1; j >= k; j--)
+      for (ssize_t k = u.degree () - v.degree (); k >= 0; k--)
+        for (ssize_t j = v.degree () + k - 1; j >= k; j--)
           coefs_[j] -= coefs_[v.degree () + k] * v.coefs_[j - k];
     }
 
-  int k = v.degree () - 1;
+  ssize_t k = v.degree () - 1;
   while (k >= 0 && coefs_[k] == 0.0)
     k--;
 
@@ -328,7 +328,7 @@ Polynomial::lc ()
   return coefs_.back ();
 }
 
-int
+ssize_t
 Polynomial::degree ()const
 {
   return coefs_.size () - 1;

diff --git a/flower/std-string.cc b/flower/std-string.cc
index 4243f675cbcf4e252c556fbafdcee16e026cfff0..dbfb0edd832a5b7c3dbf7630aef236a72e1d5156 100644 (file)
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -59,7 +59,7 @@ to_string (long b)
 string
 to_string (long unsigned b)
 {
-  return String_convert::unsigned_string (b);
+  return String_convert::unsigned_long_string (b);
 }
 
 string

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index d46426e8c6fc0271ea9d6e5e36d8eaee39ac79b8..68e6a0c0b82b199c9a499cf0e00c4d75a65dc12a 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -158,7 +158,7 @@ String_convert::hex2nibble (Byte byte)
 
 // stupido.  Should use int_string ()
 string
-String_convert::int2dec (int i, int length_i, char ch)
+String_convert::int2dec (int i, size_t length_i, char ch)
 {
   char fill_char = ch;
   if (fill_char)
@@ -168,12 +168,12 @@ String_convert::int2dec (int i, int length_i, char ch)
   string dec_string = to_string (i);
 
   // ugh
-  return to_string (fill_char, length_i - dec_string.length ()) + dec_string;
+  return to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string;
 }
 
 // stupido.  Should use int_string ()
 string
-String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
+String_convert::unsigned2hex (unsigned u, size_t length, char fill_char)
 {
   string str;
   if (!u)
@@ -189,7 +189,7 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
   str += int_string (u, "%x");  // hmm. %lx vs. %x -> portability?
 #endif
 
-  str = to_string (fill_char, length - str.length ()) + str;
+  str = to_string (fill_char, ssize_t (length - str.length ())) + str;
   while ((str.length () > length) && (str[ 0 ] == 'f'))
     str = str.substr (2);
 
@@ -197,7 +197,7 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
 }
 
 string
-String_convert::int2hex (int i, int length_i, char fill_char)
+String_convert::int2hex (int i, size_t length_i, char fill_char)
 {
   return unsigned2hex ((unsigned)i, length_i, fill_char);
 }
@@ -344,7 +344,15 @@ String_convert::unsigned_string (unsigned u)
 }
 
 string
-String_convert::pad_to (string s, int n)
+String_convert::unsigned_long_string (unsigned long ul)
+{
+  char s[STRING_BUFFER_LEN];
+  sprintf (s, "%lu", ul);
+  return s;
+}
+
+string
+String_convert::pad_to (string s, size_t n)
 {
   return s + string (max (int (n - s.length ()), 0), ' ');
 }

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index fad47fe1ad35ecbf50c2c2856028625eee666a63..66fa6d5ecf417a4e80fdc7fe4ccd9897fb642449 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -67,11 +67,11 @@ public:
 
 protected:
   void classic_output_aux (SCM output,
-                           int *first_performance_number);
-  int output_aux (SCM output_channel,
-                  bool is_last,
-                  int *first_page_number,
-                  int *first_performance_number);
+                           long *first_performance_number);
+  long output_aux (SCM output_channel,
+                   bool is_last,
+                   long *first_page_number,
+                   long *first_performance_number);
 };
 
 DECLARE_UNSMOB (Paper_book, paper_book)

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index fc61386328b2ee43e1f335a114fa6091f0d45dd0..b5870bdd887e2c7426a96c67a79732ae350ba412 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -120,13 +120,13 @@ Paper_book::add_performance (SCM s)
   performances_ = scm_cons (s, performances_);
 }
 
-int
+long
 Paper_book::output_aux (SCM output_channel,
                         bool is_last,
-                        int *first_page_number,
-                        int *first_performance_number)
+                        long *first_page_number,
+                        long *first_performance_number)
 {
-  int page_nb = 0;
+  long page_nb = 0;
   if (scm_is_pair (performances_))
     {
       SCM proc = ly_lily_module_constant ("write-performances-midis");
@@ -168,9 +168,9 @@ Paper_book::output_aux (SCM output_channel,
 void
 Paper_book::output (SCM output_channel)
 {
-  int first_page_number
+  long first_page_number
     = robust_scm2int (paper_->c_variable ("first-page-number"), 1);
-  int first_performance_number = 0;
+  long first_performance_number = 0;
 
   /* FIXME: We need a line-width for ps output (framework-ps.scm:92).
      If we don't have any, we take the paper-width unless we know
@@ -237,7 +237,7 @@ Paper_book::output (SCM output_channel)
 
 void
 Paper_book::classic_output_aux (SCM output,
-                                int *first_performance_number)
+                                long *first_performance_number)
 {
   if (scm_is_pair (performances_))
     {
@@ -256,7 +256,7 @@ Paper_book::classic_output_aux (SCM output,
 void
 Paper_book::classic_output (SCM output)
 {
-  int first_performance_number = 0;
+  long first_performance_number = 0;
   classic_output_aux (output, &first_performance_number);
 
   SCM scopes = SCM_EOL;

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 1b0f16703378144e4a0922056ceff4411655bc18..81c4ad3a29e00afa28ff840e359c120f801ecc6b 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -39,7 +39,7 @@ internal_ly_parse_scm (Parse_start *ps)
   Source_file *sf = ps->start_location_.get_source_file ();
   SCM port = sf->get_port ();
 
-  int off = ps->start_location_.start () - sf->c_str ();
+  long off = ps->start_location_.start () - sf->c_str ();
 
   scm_seek (port, scm_from_long (off), scm_from_long (SEEK_SET));
   SCM from = scm_ftell (port);

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 54e72b1ab35df5c27c6eee14888599f7c0f7bf8a..9ef7d57caa6051cbc2076795dd46c1c8f8dd968b 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -33,7 +33,7 @@ char *
 pfb2pfa (Byte const *pfb, int length)
 {
   char *out = (char *) malloc (sizeof (char));
-  int olen = 0;
+  long olen = 0;
 
   Byte const *p = pfb;
   while (p < pfb + length)

diff --git a/lily/spring.cc b/lily/spring.cc
index fc5b18f781f142de19cdd2cd55a8fab1e09ef58f..3dfd6f4ee292bde2a23ad9f3326749f2f09f2090 100644 (file)
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -97,9 +97,9 @@ merge_springs (vector<Spring> const &springs)
       min_distance = max (springs[i].min_distance (), min_distance);
     }
 
-  avg_stretch /= springs.size ();
-  avg_compress /= springs.size ();
-  avg_distance /= springs.size ();
+  avg_stretch /= Real (springs.size ());
+  avg_compress /= Real (springs.size ());
+  avg_distance /= Real (springs.size ());
   avg_distance = max (min_distance + 0.3, avg_distance);
 
   Spring ret = Spring (avg_distance, min_distance);

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index dddbbc20958e95943a9e4fd7bf746517c580f61f..b00ccb1bbde806ab568e09a5191e14b16f1ec375 100644 (file)
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -60,7 +60,7 @@ Volta_repeat_iterator::construct_children ()
 
   SCM alts = get_music ()->get_property ("elements");
 
-  alt_count_ = scm_ilength (alts);
+  alt_count_ = int (scm_ilength (alts));
   rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
   done_count_ = 0;
 }