Mercurial > octave-nkf

comparison src/error.cc @ 13987:2c0765c14e4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate unused error message buffer * error.cc (error_message_buffer): Delete static variable. Messages were written to this std::ostringstream object, but the contents were never used. (verror): Delete code that initialized and wrote to error_message_buffer.
author John W. Eaton <jwe@octave.org>
date Sun, 04 Dec 2011 03:35:25 -0500
parents 79aa00a94e9e
children 57e19c30b7d6
comparison
equal deleted inserted replaced
13986:6be49527e4cf 13987:2c0765c14e4f
117 bool discard_error_messages = false; 117 bool discard_error_messages = false;
118 118
119 // TRUE means warning messages are turned off. 119 // TRUE means warning messages are turned off.
120 bool discard_warning_messages = false; 120 bool discard_warning_messages = false;
121 121
122 // The message buffer.
123 static std::ostringstream *error_message_buffer = 0;
124
125 void 122 void
126 reset_error_handler (void) 123 reset_error_handler (void)
127 { 124 {
128 error_state = 0; 125 error_state = 0;
129 warning_state = 0; 126 warning_state = 0;
261 } 258 }
262 else 259 else
263 Vlast_error_stack = initialize_last_error_stack (); 260 Vlast_error_stack = initialize_last_error_stack ();
264 } 261 }
265 262
266 if (buffer_error_messages) 263 if (! buffer_error_messages)
267 {
268 if (error_message_buffer)
269 msg_string = "error: " + msg_string;
270 else
271 error_message_buffer = new std::ostringstream ();
272
273 *error_message_buffer << msg_string;
274 }
275 else
276 { 264 {
277 octave_diary << msg_string; 265 octave_diary << msg_string;
278 os << msg_string; 266 os << msg_string;
279 } 267 }
280 } 268 }