Mercurial > octave

diff libinterp/corefcn/dynamic-ld.cc @ 20555:f90c8372b7ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate many more simple uses of error_state * Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc, det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc, levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc, lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc, pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc, strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc, symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc, pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc, pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 19:29:36 -0400
parents 7ac907da9fba
children 35241c4b696c
line wrap: on
line diff
--- a/libinterp/corefcn/dynamic-ld.cc	Mon Oct 05 12:03:16 2015 -0700
+++ b/libinterp/corefcn/dynamic-ld.cc	Mon Oct 05 19:29:36 2015 -0400
@@ -269,39 +269,36 @@
     {
       oct_file.open (file_name);
 
-      if (! error_state && oct_file)
+      if (oct_file)
         octave_shlib_list::append (oct_file);
     }
 
-  if (! error_state)
+  if (oct_file)
     {
-      if (oct_file)
-        {
-          void *function = oct_file.search (fcn_name, name_mangler);
+      void *function = oct_file.search (fcn_name, name_mangler);
 
-          if (! function)
-            {
-              // FIXME: can we determine this C mangling scheme
-              // automatically at run time or configure time?
+      if (! function)
+        {
+          // FIXME: can we determine this C mangling scheme
+          // automatically at run time or configure time?
 
-              function = oct_file.search (fcn_name, name_uscore_mangler);
-            }
+          function = oct_file.search (fcn_name, name_uscore_mangler);
+        }
 
-          if (function)
-            {
-              octave_dld_fcn_getter f
-                = FCN_PTR_CAST (octave_dld_fcn_getter, function);
+      if (function)
+        {
+          octave_dld_fcn_getter f
+            = FCN_PTR_CAST (octave_dld_fcn_getter, function);
 
-              retval = f (oct_file, relative);
+          retval = f (oct_file, relative);
 
-              if (! retval)
-                error ("failed to install .oct file function '%s'",
-                       fcn_name.c_str ());
-            }
+          if (! retval)
+            error ("failed to install .oct file function '%s'",
+                   fcn_name.c_str ());
         }
-      else
-        error ("%s is not a valid shared library", file_name.c_str ());
     }
+  else
+    error ("%s is not a valid shared library", file_name.c_str ());
 
   return retval;
 }
@@ -328,46 +325,43 @@
     {
       mex_file.open (file_name);
 
-      if (! error_state && mex_file)
+      if (mex_file)
         octave_shlib_list::append (mex_file);
     }
 
-  if (! error_state)
+  if (mex_file)
     {
-      if (mex_file)
+      void *function = 0;
+
+      bool have_fmex = false;
+
+      function = mex_file.search (fcn_name, mex_mangler);
+
+      if (! function)
         {
-          void *function = 0;
+          // FIXME: can we determine this C mangling scheme
+          // automatically at run time or configure time?
 
-          bool have_fmex = false;
-
-          function = mex_file.search (fcn_name, mex_mangler);
+          function = mex_file.search (fcn_name, mex_uscore_mangler);
 
           if (! function)
             {
-              // FIXME: can we determine this C mangling scheme
-              // automatically at run time or configure time?
+              function = mex_file.search (fcn_name, mex_f77_mangler);
 
-              function = mex_file.search (fcn_name, mex_uscore_mangler);
-
-              if (! function)
-                {
-                  function = mex_file.search (fcn_name, mex_f77_mangler);
+              if (function)
+                have_fmex = true;
+            }
+        }
 
-                  if (function)
-                    have_fmex = true;
-                }
-            }
-
-          if (function)
-            retval = new octave_mex_function (function, have_fmex,
-                                              mex_file, fcn_name);
-          else
-            error ("failed to install .mex file function '%s'",
-                   fcn_name.c_str ());
-        }
+      if (function)
+        retval = new octave_mex_function (function, have_fmex,
+                                          mex_file, fcn_name);
       else
-        error ("%s is not a valid shared library", file_name.c_str ());
+        error ("failed to install .mex file function '%s'",
+               fcn_name.c_str ());
     }
+  else
+    error ("%s is not a valid shared library", file_name.c_str ());
 
   return retval;
 }