From bcb96d93372d54a17965f125f23509eb57df418a Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Mon, 16 Apr 2012 06:27:14 -0400 Subject: [PATCH] Change some asserts flagging runtime errors to fatal_asserts (Anders Kaseorg) --- src/examples/benchmark.cc | 3 ++- src/examples/parse.cc | 3 ++- src/examples/termemu.cc | 2 +- src/frontend/mosh-server.cc | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/examples/benchmark.cc b/src/examples/benchmark.cc index 26362f2..5dae9f2 100644 --- a/src/examples/benchmark.cc +++ b/src/examples/benchmark.cc @@ -44,6 +44,7 @@ #include "user.h" #include "terminaloverlay.h" #include "locale_utils.h" +#include "fatal_assert.h" const int ITERATIONS = 100000; @@ -61,7 +62,7 @@ int main( void ) /* Adopt native locale */ set_native_locale(); - assert( is_utf8_locale() ); + fatal_assert( is_utf8_locale() ); for ( int i = 0; i < ITERATIONS; i++ ) { /* type a character */ diff --git a/src/examples/parse.cc b/src/examples/parse.cc index 87eea42..f507eec 100644 --- a/src/examples/parse.cc +++ b/src/examples/parse.cc @@ -42,6 +42,7 @@ #include "parser.h" #include "swrite.h" #include "locale_utils.h" +#include "fatal_assert.h" const size_t buf_size = 1024; @@ -57,7 +58,7 @@ int main( int argc __attribute__((unused)), struct termios saved_termios, raw_termios, child_termios; set_native_locale(); - assert( is_utf8_locale() ); + fatal_assert( is_utf8_locale() ); if ( tcgetattr( STDIN_FILENO, &saved_termios ) < 0 ) { perror( "tcgetattr" ); diff --git a/src/examples/termemu.cc b/src/examples/termemu.cc index 90b4372..9c9f63b 100644 --- a/src/examples/termemu.cc +++ b/src/examples/termemu.cc @@ -62,7 +62,7 @@ int main( void ) struct termios saved_termios, raw_termios, child_termios; set_native_locale(); - assert( is_utf8_locale() ); + fatal_assert( is_utf8_locale() ); if ( tcgetattr( STDIN_FILENO, &saved_termios ) < 0 ) { perror( "tcgetattr" ); diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc index c68d339..46a5533 100644 --- a/src/frontend/mosh-server.cc +++ b/src/frontend/mosh-server.cc @@ -214,7 +214,7 @@ int main( int argc, char *argv[] ) i != locale_vars.end(); i++ ) { char *env_string = strdup( i->c_str() ); - assert( env_string ); + fatal_assert( env_string ); if ( 0 != putenv( env_string ) ) { perror( "putenv" ); }