Mercurial > octave-nkf

changeset 10076:4b270d1540f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid various GCC warnings
author John W. Eaton <jwe@octave.org>
date Sat, 09 Jan 2010 02:24:49 -0500
parents 84b0725f4b09
children 6ece454060b3
files doc/ChangeLog doc/interpreter/munge-texi.cc src/ChangeLog src/DLD-FUNCTIONS/fltk_backend.cc src/DLD-FUNCTIONS/lookup.cc src/data.cc src/dynamic-ld.cc src/gl-render.cc src/oct-stream.cc
diffstat 9 files changed, 98 insertions(+), 56 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog	Fri Jan 08 11:25:08 2010 +0100
+++ b/doc/ChangeLog	Sat Jan 09 02:24:49 2010 -0500
@@ -1,3 +1,8 @@
+2010-01-09  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/munge-texi.cc: Avoid C-style casts.
+	(main): Call usage if fewer than two arguments.
+
 2009-12-20  Rik <octave@nomad.inbox5.com>
 
 	* interpreter/geometryimages.m: Correctly set postscript output when QHULL
--- a/doc/interpreter/munge-texi.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/doc/interpreter/munge-texi.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -60,7 +60,7 @@
 
   int c;
   while ((c = is.get ()) != EOF && c != '\n')
-    symbol_name += (char) c;
+    symbol_name += static_cast<char> (c);
 
   return symbol_name;
 }
@@ -78,16 +78,16 @@
         {
           char buf[16];
           int i = 0;
-          buf[i++] = (char) c;
+          buf[i++] = static_cast<char> (c);
           
-          if ((   buf[i++] = (char) is.get ()) == 's'  
-              && (buf[i++] = (char) is.get ()) == 'e'
-              && (buf[i++] = (char) is.get ()) == 'e'
-              && (buf[i++] = (char) is.get ()) == 'a'
-              && (buf[i++] = (char) is.get ()) == 'l'
-              && (buf[i++] = (char) is.get ()) == 's'
-              && (buf[i++] = (char) is.get ()) == 'o'
-              && (buf[i++] = (char) is.get ()) == '{')
+          if ((   buf[i++] = static_cast<char> (is.get ())) == 's'  
+              && (buf[i++] = static_cast<char> (is.get ())) == 'e'
+              && (buf[i++] = static_cast<char> (is.get ())) == 'e'
+              && (buf[i++] = static_cast<char> (is.get ())) == 'a'
+              && (buf[i++] = static_cast<char> (is.get ())) == 'l'
+              && (buf[i++] = static_cast<char> (is.get ())) == 's'
+              && (buf[i++] = static_cast<char> (is.get ())) == 'o'
+              && (buf[i++] = static_cast<char> (is.get ())) == '{')
             {
               doc += "@seealso{";
               
@@ -115,7 +115,7 @@
                   // get function name
 	          std::string function_name;
                   do 
-                    function_name += (char) c;
+                    function_name += static_cast<char> (c);
                   while ((c = is.get ()) != EOF
                           && c != doc_delim
                           && c != ' '
@@ -140,7 +140,7 @@
                     break;
                 }
               if (c == '}')
-                doc += (char) c;
+                doc += static_cast<char> (c);
             }
           else
             {
@@ -149,7 +149,7 @@
             }
         }
       else
-        doc += (char) c;
+        doc += static_cast<char> (c);
     }
   return doc;
 }
@@ -238,7 +238,7 @@
 
       while ((c = infile.get ()) != EOF)
 	{
-	  os << (char) c;
+	  os << static_cast<char> (c);
 	  clast = c;
 	}
 
@@ -267,26 +267,26 @@
 	    {
 	      char buf[16];
 	      int i = 0;
-	      buf[i++] = (char) c;
+	      buf[i++] = static_cast<char> (c);
 
-	      buf[i++] = c = (char) is.get ();
+	      buf[i++] = c = static_cast<char> (is.get ());
 
 	      if (c == 'D')
 		{
 		  std::string symbol_name;
 
-		  if (   (buf[i++] = (char) is.get ()) == 'O'
-		      && (buf[i++] = (char) is.get ()) == 'C'
-		      && (buf[i++] = (char) is.get ()) == 'S'
-		      && (buf[i++] = (char) is.get ()) == 'T'
-		      && (buf[i++] = (char) is.get ()) == 'R'
-		      && (buf[i++] = (char) is.get ()) == 'I'
-		      && (buf[i++] = (char) is.get ()) == 'N'
-		      && (buf[i++] = (char) is.get ()) == 'G'
-		      && (buf[i++] = (char) is.get ()) == '(')
+		  if (   (buf[i++] = static_cast<char> (is.get ())) == 'O'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'C'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'S'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'T'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'R'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'I'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'N'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'G'
+                      && (buf[i++] = static_cast<char> (is.get ())) == '(')
 		    {
 		      while ((c = is.get ()) != EOF && c != ')')
-			symbol_name += (char) c;
+			symbol_name += static_cast<char> (c);
 
 		      if (is.eof ())
 			fatal ("end of file while reading @DOCSTRING command");
@@ -343,20 +343,20 @@
 		{
 		  std::string file_name;
 
-		  if (   (buf[i++] = (char) is.get ()) == 'X'
-		      && (buf[i++] = (char) is.get ()) == 'A'
-		      && (buf[i++] = (char) is.get ()) == 'M'
-		      && (buf[i++] = (char) is.get ()) == 'P'
-		      && (buf[i++] = (char) is.get ()) == 'L'
-		      && (buf[i++] = (char) is.get ()) == 'E'
-		      && (buf[i++] = (char) is.get ()) == 'F'
-		      && (buf[i++] = (char) is.get ()) == 'I'
-		      && (buf[i++] = (char) is.get ()) == 'L'
-		      && (buf[i++] = (char) is.get ()) == 'E'
-		      && (buf[i++] = (char) is.get ()) == '(')
+		  if (   (buf[i++] = static_cast<char> (is.get ())) == 'X'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'A'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'M'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'P'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'L'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'E'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'F'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'I'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'L'
+                      && (buf[i++] = static_cast<char> (is.get ())) == 'E'
+                      && (buf[i++] = static_cast<char> (is.get ())) == '(')
 		    {
 		      while ((c = is.get ()) != EOF && c != ')')
-			file_name += (char) c;
+			file_name += static_cast<char> (c);
 
 		      file_name = top_srcdir + "/examples/" + file_name;
 
@@ -369,14 +369,14 @@
 		bol = recover_from_macro (os, buf, i);
 	    }
 	  else
-	    os.put ((char) c);
+	    os.put (static_cast<char> (c));
 	}
       else
 	{
 	  if (c == '\n')
 	    bol = true;
 
-	  os.put ((char) (c));
+	  os.put (static_cast<char> (c));
 	}
     }
 }
@@ -384,14 +384,26 @@
 int
 main (int argc, char **argv)
 {
-  top_srcdir = *++argv;
+  int retval = 0;
+
+  if (argc > 1)
+    {
+      top_srcdir = *++argv;
+
+      while (*++argv)
+        process_doc_file (*argv);
 
-  while (*++argv)
-    process_doc_file (*argv);
+      process_texi_input_file (std::cin, std::cout);
+    }
+  else
+    {
+      usage ();
 
-  process_texi_input_file (std::cin, std::cout);
+      retval = 1;
+    }
 
-  return 0;
+  return retval;
+
 }
 
 /*
--- a/src/ChangeLog	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/ChangeLog	Sat Jan 09 02:24:49 2010 -0500
@@ -1,3 +1,21 @@
+2010-01-09  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/lookup.cc (stri_comp_lt, stri_comp_gt):
+	Comment out unused functions.
+
+	* oct-stream.cc (BEGIN_S_CONVERSION): Don't declare local tmp
+	variable twice.
+
+	* gl-render.cc (opengl_renderer::draw_image): Avoid shadow
+	declaration warning from GCC.
+
+	* DLD-FUNCTIONS/fltk_backend.cc (base_graphics_backend):
+	Avoid unused parameter warning from GCC.
+	* dynamic-ld.cc (octave_dynamic_loader::do_load_mex): Likewise.
+
+	* data.cc (get_sort_mode_option): Avoid uninitialized variable
+	warning from GCC.
+
 2010-01-08  Jaroslav Hajek  <highegg@gmail.com>
 
 	* oct-obj.h (octave_value_list::operator () const,
--- a/src/DLD-FUNCTIONS/fltk_backend.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/DLD-FUNCTIONS/fltk_backend.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -996,9 +996,9 @@
   }
 
   void print_figure (const graphics_object& go,
-		     const std::string& term,
-		     const std::string& file, bool mono,
-		     const std::string& debug_file) const 
+		     const std::string& /*term*/,
+		     const std::string& file, bool /*mono*/,
+		     const std::string& /*debug_file*/) const 
   { 
     figure_manager::print (go.get_handle (), file);
   }
--- a/src/DLD-FUNCTIONS/lookup.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/DLD-FUNCTIONS/lookup.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -61,8 +61,10 @@
     { return std::toupper (x) > std::toupper (y); }
 };
 
-// FIXME: maybe these should go elsewhere?
+// FIXME -- maybe these should go elsewhere?
+// FIXME -- are they even needed now?
 // case-insensitive ascending comparator
+#if 0
 static bool
 stri_comp_lt (const std::string& a, const std::string& b)
 {
@@ -79,6 +81,7 @@
                                        b.begin (), b.end (),
                                        icmp_char_gt());
 }
+#endif
 
 template <class T>
 inline sortmode 
--- a/src/data.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/data.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -6091,7 +6091,10 @@
 static sortmode
 get_sort_mode_option (const octave_value& arg, const char *argn)
 {
-  sortmode smode;
+  // FIXME -- we initialize to UNSORTED here to avoid a GCC warning
+  // about possibly using sortmode uninitialized.
+  // FIXME -- shouldn't these modes be scoped inside a class?
+  sortmode smode = UNSORTED;
 
   std::string mode = arg.string_value ();
 
--- a/src/dynamic-ld.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/dynamic-ld.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -390,7 +390,7 @@
 octave_function *
 octave_dynamic_loader::do_load_mex (const std::string& fcn_name,
 				    const std::string& file_name,
-				    bool relative)
+				    bool /*relative*/)
 {
   octave_function *retval = 0;
 
--- a/src/gl-render.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/gl-render.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -2716,10 +2716,11 @@
     }
   else
     {
-      const ColumnVector p1 = xform.transform (x(1) + 1, y(1), 0);
-      pix_dx = p1(0) - p0(0);
+      const ColumnVector p1w = xform.transform (x(1) + 1, y(1), 0);
+      pix_dx = p1w(0) - p0(0);
       nor_dx = 1;
     }
+
   if (h > 1)
     {
       pix_dy = (p1(1) - p0(1))/(h-1);
@@ -2727,8 +2728,8 @@
     }
   else
     {
-      const ColumnVector p1 = xform.transform (x(1), y(1) + 1, 0);
-      pix_dy = p1(1) - p0(1);
+      const ColumnVector p1h = xform.transform (x(1), y(1) + 1, 0);
+      pix_dy = p1h(1) - p0(1);
       nor_dy = 1;
     }
 
--- a/src/oct-stream.cc	Fri Jan 08 11:25:08 2010 +0100
+++ b/src/oct-stream.cc	Sat Jan 09 02:24:49 2010 -0500
@@ -1577,7 +1577,7 @@
     { \
       if (width) \
         { \
-          std::string tmp (width, '\0'); \
+          tmp = std::string (width, '\0'); \
  \
           int c = EOF; \
  \