Mercurial > octave

diff libinterp/dldfcn/__magick_read__.cc @ 20790:c2d9556d51d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate return statements after calls to print_usage * __delaunayn__.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc: Eliminate return statements after calls to print_usage.
author John W. Eaton <jwe@octave.org>
date Thu, 03 Dec 2015 12:15:38 -0500
parents 131b4af8b5d8
children d9ca869ca124
line wrap: on
line diff
--- a/libinterp/dldfcn/__magick_read__.cc	Thu Dec 03 09:26:04 2015 -0800
+++ b/libinterp/dldfcn/__magick_read__.cc	Thu Dec 03 12:15:38 2015 -0500
@@ -762,10 +762,7 @@
   maybe_initialize_magick ();
 
   if (args.length () != 2 || ! args(0).is_string ())
-    {
-      print_usage ();
-      return output;
-    }
+    print_usage ();
 
   const octave_scalar_map options = args(1).xscalar_map_value ("__magick_read__: OPTIONS must be a struct");
 
@@ -1414,10 +1411,8 @@
   maybe_initialize_magick ();
 
   if (args.length () != 5 || ! args(0).is_string () || ! args(1).is_string ())
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
+
   const std::string filename = args(0).string_value ();
   const std::string ext = args(1).string_value ();
 
@@ -1595,10 +1590,8 @@
   maybe_initialize_magick ();
 
   if (args.length () < 1 || ! args(0).is_string ())
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
+
   const std::string filename = args(0).string_value ();
   int idx;
   if (args.length () > 1)
@@ -1818,10 +1811,8 @@
   maybe_initialize_magick ();
 
   if (args.length () < 1 || ! args(0).is_string ())
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
+
   const std::string filename = args(0).string_value ();
 
   std::vector<Magick::Image> imvec;
@@ -2267,10 +2258,8 @@
   gripe_disabled_feature ("imformats", "Image IO");
 #else
   if (args.length () != 1 || ! args(0).is_map ())
-    {
-      print_usage ();
-      return retval;
-    }
+    print_usage ();
+
   octave_map formats = args(0).map_value ();
 
   maybe_initialize_magick ();