octave-lyh: src/toplev.cc comparison

[project @ 2008-01-22 20:31:59 by jwe]

comparison

equal deleted inserted replaced

-:246f905cb984
+:73036cdd855d
 	  flush_octave_stdout ();
 	}
 }
 }
+void
+octave_add_atexit_function (const std::string& fname)
+{
+octave_atexit_functions.push_front (fname);
+}
+bool
+octave_remove_atexit_function (const std::string& fname)
+{
+bool found = false;
+for (std::list<std::string>::iterator p = octave_atexit_functions.begin ();
+p != octave_atexit_functions.end (); p++)
+{
+if (*p == fname)
+	{
+	  octave_atexit_functions.erase (p);
+	  found = true;
+	  break;
+	}
+}
+return found;
+}
 DEFUN (atexit, args, nargout,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} atexit (@var{fcn})\n\
 Register a function to be called when Octave exits.  For example,\n\
 \n\
 }
 if (! error_state)
 	    {
 	      if (add_mode)
-		octave_atexit_functions.push_front (arg);
+		octave_add_atexit_function (arg);
 	      else
 		{
-		  bool found = false;
+		  bool found = octave_remove_atexit_function (arg);
-		  std::list<std::string>::iterator it;
-		  for (std::list<std::string>::iterator p = octave_atexit_functions.begin ();
-		       p != octave_atexit_functions.end (); p++)
-		    {
-		      if (*p == arg)
-			{
-			  octave_atexit_functions.erase (p);
-			  found = true;
-			  break;
-			}
-		    }
 		  if (nargout > 0)
 		    retval(0) = found;
 		}
 	    }

Mercurial > hg > octave-lyh