Mercurial > octave-nkf

changeset 19820:d6652461dfbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid variable possibly clobbered by longjmp warning from GCC * cmd-edit.cc (gnu_readline::do_readline): Move more code inside INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE block.
author John W. Eaton <jwe@octave.org>
date Fri, 20 Feb 2015 04:08:04 -0500
parents 299fe39163a2
children 4ae2987c5f66
files liboctave/util/cmd-edit.cc
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/cmd-edit.cc	Fri Feb 20 03:55:59 2015 -0500
+++ b/liboctave/util/cmd-edit.cc	Fri Feb 20 04:08:04 2015 -0500
@@ -273,15 +273,11 @@
 
   eof = false;
 
-  char *line = 0;
-
   const char *p = prompt.c_str ();
 
   BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
 
-  line = ::octave_rl_readline (p);
-
-  END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
+  char *line = ::octave_rl_readline (p);
 
   if (line)
     {
@@ -292,6 +288,8 @@
   else
     eof = true;
 
+  END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
+
   return retval;
 }