Mercurial > octave-nkf

diff libinterp/corefcn/sysdep.cc @ 20587: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 aa36fb998a4d
children ba2b07c13913
line wrap: on
line diff
--- a/libinterp/corefcn/sysdep.cc	Mon Oct 05 12:03:16 2015 -0700
+++ b/libinterp/corefcn/sysdep.cc	Mon Oct 05 19:29:36 2015 -0400
@@ -620,8 +620,7 @@
     {
       std::string name = args(0).string_value ();
 
-      if (! error_state)
-        retval = octave_env::getenv (name);
+      retval = octave_env::getenv (name);
     }
   else
     print_usage ();
@@ -700,11 +699,7 @@
     {
       std::string tmp = args(0).string_value ();
 
-      if (! error_state)
-        {
-          int status = gnulib::unsetenv (tmp.c_str ());
-          retval = status;
-        }
+      retval = gnulib::unsetenv (tmp.c_str ());
     }
   else
     print_usage ();
@@ -805,23 +800,20 @@
     {
       double dval = args(0).double_value ();
 
-      if (! error_state)
+      if (! xisnan (dval))
         {
-          if (! xisnan (dval))
-            {
-              Fdrawnow ();
+          Fdrawnow ();
 
-              if (xisinf (dval))
-                {
-                  flush_octave_stdout ();
-                  octave_kbhit ();
-                }
-              else
-                octave_sleep (dval);
+          if (xisinf (dval))
+            {
+              flush_octave_stdout ();
+              octave_kbhit ();
             }
           else
-            warning ("pause: NaN is an invalid delay");
+            octave_sleep (dval);
         }
+      else
+        warning ("pause: NaN is an invalid delay");
     }
   else
     {
@@ -853,15 +845,12 @@
     {
       double dval = args(0).double_value ();
 
-      if (! error_state)
+      if (xisnan (dval))
+        warning ("sleep: NaN is an invalid delay");
+      else
         {
-          if (xisnan (dval))
-            warning ("sleep: NaN is an invalid delay");
-          else
-            {
-              Fdrawnow ();
-              octave_sleep (dval);
-            }
+          Fdrawnow ();
+          octave_sleep (dval);
         }
     }
   else
@@ -896,19 +885,16 @@
     {
       double dval = args(0).double_value ();
 
-      if (! error_state)
+      if (xisnan (dval))
+        warning ("usleep: NaN is an invalid delay");
+      else
         {
-          if (xisnan (dval))
-            warning ("usleep: NaN is an invalid delay");
-          else
-            {
-              Fdrawnow ();
+          Fdrawnow ();
 
-              int delay = NINT (dval);
+          int delay = NINT (dval);
 
-              if (delay > 0)
-                octave_usleep (delay);
-            }
+          if (delay > 0)
+            octave_usleep (delay);
         }
     }
   else