Remove a Network::Exception that isn't one.

Code smell pointed out by Coverity.
This commit is contained in:
John Hood
2016-11-19 20:59:49 -05:00
parent 4fe706a4d3
commit 24eb5a7544
6 changed files with 25 additions and 33 deletions
+6 -5
View File
@@ -539,15 +539,16 @@ bool STMClient::main( void )
network->tick();
const Network::NetworkException *exn = network->get_send_exception();
if ( exn ) {
overlays.get_notification_engine().set_network_exception( *exn );
string & send_error = network->get_send_error();
if ( !send_error.empty() ) {
overlays.get_notification_engine().set_network_error( send_error );
send_error.clear();
} else {
overlays.get_notification_engine().clear_network_exception();
overlays.get_notification_engine().clear_network_error();
}
} catch ( const Network::NetworkException &e ) {
if ( !network->shutdown_in_progress() ) {
overlays.get_notification_engine().set_network_exception( e );
overlays.get_notification_engine().set_network_error( e.what() );
}
struct timespec req;
+1 -1
View File
@@ -168,7 +168,7 @@ NotificationEngine::NotificationEngine()
last_acked_state( timestamp() ),
escape_key_string(),
message(),
message_is_network_exception( false ),
message_is_network_error( false ),
message_expiration( -1 ),
show_quit_keystroke( true )
{}
+7 -8
View File
@@ -40,7 +40,6 @@
#include <vector>
#include <limits.h>
#include <exception>
namespace Overlay {
using namespace Terminal;
@@ -147,7 +146,7 @@ namespace Overlay {
uint64_t last_acked_state;
string escape_key_string;
wstring message;
bool message_is_network_exception;
bool message_is_network_error;
uint64_t message_expiration;
bool show_quit_keystroke;
@@ -171,7 +170,7 @@ namespace Overlay {
} else {
message_expiration = timestamp() + 1000;
}
message_is_network_exception = false;
message_is_network_error = false;
show_quit_keystroke = s_show_quit_keystroke;
}
@@ -182,19 +181,19 @@ namespace Overlay {
escape_key_string = tmp;
}
void set_network_exception( const std::exception &e )
void set_network_error( const std::string &s )
{
wchar_t tmp[ 128 ];
swprintf( tmp, 128, L"%s", e.what() );
swprintf( tmp, 128, L"%s", s.c_str() );
message = tmp;
message_is_network_exception = true;
message_is_network_error = true;
message_expiration = timestamp() + Network::ACK_INTERVAL + 100;
}
void clear_network_exception()
void clear_network_error()
{
if ( message_is_network_exception ) {
if ( message_is_network_error ) {
message_expiration = std::min( message_expiration, timestamp() + 1000 );
}
}