Small cleanups

This commit is contained in:
Keith Winstein
2011-08-26 05:54:40 -04:00
parent 4a513ff496
commit 97fd644a06
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -84,7 +84,7 @@ int main( int argc, char *argv[] )
exit( 1 ); exit( 1 );
} }
printf( "[stm is exiting.]\n" ); printf( "\n[stm is exiting.]\n" );
return 0; return 0;
} }
+4 -3
View File
@@ -76,9 +76,6 @@ namespace Network {
/* Starts shutdown sequence */ /* Starts shutdown sequence */
void start_shutdown( void ) { shutdown_in_progress = true; } void start_shutdown( void ) { shutdown_in_progress = true; }
bool get_shutdown_in_progress( void ) { return shutdown_in_progress; }
bool get_shutdown_acknowledged( void ) { return sent_states.front().num == uint64_t(-1); }
bool get_counterparty_shutdown_acknowledged( void ) { return last_instruction_sent.ack_num() == uint64_t(-1); }
/* Misc. getters and setters */ /* Misc. getters and setters */
/* Cannot modify current_state while shutdown in progress */ /* Cannot modify current_state while shutdown in progress */
@@ -86,6 +83,10 @@ namespace Network {
void set_current_state( const MyState &x ) { assert( !shutdown_in_progress ); current_state = x; } void set_current_state( const MyState &x ) { assert( !shutdown_in_progress ); current_state = x; }
void set_verbose( void ) { verbose = true; } void set_verbose( void ) { verbose = true; }
bool get_shutdown_in_progress( void ) { return shutdown_in_progress; }
bool get_shutdown_acknowledged( void ) { return sent_states.front().num == uint64_t(-1); }
bool get_counterparty_shutdown_acknowledged( void ) { return last_instruction_sent.ack_num() == uint64_t(-1); }
/* nonexistent methods to satisfy -Weffc++ */ /* nonexistent methods to satisfy -Weffc++ */
TransportSender( const TransportSender &x ); TransportSender( const TransportSender &x );
TransportSender & operator=( const TransportSender &x ); TransportSender & operator=( const TransportSender &x );