Mercurial > octave

diff libinterp/corefcn/ls-oct-text.cc @ 20741:a5ab31b52ae8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more uses of error_state * __qp__.cc, besselj.cc, data.cc, file-io.cc, input.cc, load-save.cc, ls-oct-text.cc, oct-map.cc, oct-stream.cc, syscalls.cc, toplev.cc, ov-base.cc, ov-cell.cc, ov-fcn-handle.cc: Eliminate more uses of error_state. * ov.h, ov.cc (octave_value::xfunction_value, octave_value::xuser_function_value, octave_value::xuser_script_value, octave_value::xuser_code_value, octave_value::xfcn_handle_value, octave_value::xfcn_inline_value, octave_value::xlist_value): New value extraction functions.
author John W. Eaton <jwe@octave.org>
date Mon, 23 Nov 2015 20:50:07 -0500
parents c6224b4e7774
children 35241c4b696c
line wrap: on
line diff
--- a/libinterp/corefcn/ls-oct-text.cc	Thu Nov 19 16:56:39 2015 -0500
+++ b/libinterp/corefcn/ls-oct-text.cc	Mon Nov 23 20:50:07 2015 -0500
@@ -251,11 +251,8 @@
 
   if (! (name == ".nargin." || name == ".nargout."
          || name == CELL_ELT_TAG || valid_identifier (name)))
-    {
-      error ("load: bogus identifier '%s' found in file '%s'",
-             name.c_str (), filename.c_str ());
-      return std::string ();
-    }
+    error ("load: bogus identifier '%s' found in file '%s'",
+           name.c_str (), filename.c_str ());
 
   // Look for type keyword.
 
@@ -287,12 +284,6 @@
   else
     error ("load: failed to extract keyword specifying value type");
 
-  if (error_state)
-    {
-      error ("load: reading file %s", filename.c_str ());
-      return std::string ();
-    }
-
   return name;
 }