# HG changeset patch # User John W. Eaton # Date 1424423284 18000 # Node ID d6652461dfbc79edebacb9356d1f0bd550041dee # Parent 299fe39163a23625a3631b8d1c1c4c7848a04ff8 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. diff -r 299fe39163a2 -r d6652461dfbc liboctave/util/cmd-edit.cc --- 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; }