From 33464197240839b3a2b7879924ba3744ed4dccc7 Mon Sep 17 00:00:00 2001 From: John Hood Date: Mon, 7 Nov 2016 00:56:02 -0500 Subject: [PATCH] Remove excessive parentheses There are many more. --- src/frontend/mosh-server.cc | 4 ++-- src/network/network.cc | 8 ++++---- src/network/transportfragment.cc | 2 +- src/terminal/parserstate.cc | 10 +++++----- src/terminal/terminal.cc | 2 +- src/terminal/terminaldispatcher.cc | 8 ++++++-- src/terminal/terminaldisplay.cc | 3 ++- src/terminal/terminalfunctions.cc | 4 ++-- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc index 92756bf..386fcf9 100644 --- a/src/frontend/mosh-server.cc +++ b/src/frontend/mosh-server.cc @@ -948,7 +948,7 @@ static bool motd_hushed( void ) { /* must be in home directory already */ struct stat buf; - return (0 == lstat( ".hushlogin", &buf )); + return 0 == lstat( ".hushlogin", &buf ); } #ifdef HAVE_UTMPX_H @@ -956,7 +956,7 @@ static bool device_exists( const char *ut_line ) { string device_name = string( "/dev/" ) + string( ut_line ); struct stat buf; - return (0 == lstat( device_name.c_str(), &buf )); + return 0 == lstat( device_name.c_str(), &buf ); } #endif diff --git a/src/network/network.cc b/src/network/network.cc index 9dfcfdf..a6f22e4 100644 --- a/src/network/network.cc +++ b/src/network/network.cc @@ -504,12 +504,12 @@ string Connection::recv_one( int sock_to_recv, bool nonblocking ) struct cmsghdr *ecn_hdr = CMSG_FIRSTHDR( &header ); if ( ecn_hdr - && (ecn_hdr->cmsg_level == IPPROTO_IP) - && ((ecn_hdr->cmsg_type == IP_TOS) + && ecn_hdr->cmsg_level == IPPROTO_IP + && ( ecn_hdr->cmsg_type == IP_TOS #ifdef IP_RECVTOS - || (ecn_hdr->cmsg_type == IP_RECVTOS) + || ecn_hdr->cmsg_type == IP_RECVTOS #endif - )) { + ) ) { /* got one */ uint8_t *ecn_octet_p = (uint8_t *)CMSG_DATA( ecn_hdr ); assert( ecn_octet_p ); diff --git a/src/network/transportfragment.cc b/src/network/transportfragment.cc index 181d63e..a62d9b2 100644 --- a/src/network/transportfragment.cc +++ b/src/network/transportfragment.cc @@ -124,7 +124,7 @@ bool FragmentAssembly::add_fragment( Fragment &frag ) } /* see if we're done */ - return ( fragments_arrived == fragments_total ); + return fragments_arrived == fragments_total; } Instruction FragmentAssembly::get_assembly( void ) diff --git a/src/terminal/parserstate.cc b/src/terminal/parserstate.cc index 3eff7c7..112f856 100644 --- a/src/terminal/parserstate.cc +++ b/src/terminal/parserstate.cc @@ -79,15 +79,15 @@ Transition State::input( wchar_t ch ) const static bool C0_prime( wchar_t ch ) { - return ( (ch <= 0x17) - || (ch == 0x19) - || ( (0x1C <= ch) && (ch <= 0x1F) ) ); + return (ch <= 0x17) + || (ch == 0x19) + || ( (0x1C <= ch) && (ch <= 0x1F) ); } static bool GLGR ( wchar_t ch ) { - return ( ( (0x20 <= ch) && (ch <= 0x7F) ) /* GL area */ - || ( (0xA0 <= ch) && (ch <= 0xFF) ) ); /* GR area */ + return ( (0x20 <= ch) && (ch <= 0x7F) ) /* GL area */ + || ( (0xA0 <= ch) && (ch <= 0xFF) ); /* GR area */ } Transition Ground::input_state_rule( wchar_t ch ) const diff --git a/src/terminal/terminal.cc b/src/terminal/terminal.cc index 5a010e6..af7d2bf 100644 --- a/src/terminal/terminal.cc +++ b/src/terminal/terminal.cc @@ -179,5 +179,5 @@ void Emulator::resize( size_t s_width, size_t s_height ) bool Emulator::operator==( Emulator const &x ) const { /* dispatcher and user are irrelevant for us */ - return ( fb == x.fb ); + return fb == x.fb; } diff --git a/src/terminal/terminaldispatcher.cc b/src/terminal/terminaldispatcher.cc index 13ac829..f8195ee 100644 --- a/src/terminal/terminaldispatcher.cc +++ b/src/terminal/terminaldispatcher.cc @@ -248,6 +248,10 @@ void Dispatcher::OSC_start( const Parser::OSC_Start *act __attribute((unused)) ) bool Dispatcher::operator==( const Dispatcher &x ) const { - return ( params == x.params ) && ( parsed_params == x.parsed_params ) && ( parsed == x.parsed ) - && ( dispatch_chars == x.dispatch_chars ) && ( OSC_string == x.OSC_string ) && ( terminal_to_host == x.terminal_to_host ); + return ( params == x.params ) + && ( parsed_params == x.parsed_params ) + && ( parsed == x.parsed ) + && ( dispatch_chars == x.dispatch_chars ) + && ( OSC_string == x.OSC_string ) + && ( terminal_to_host == x.terminal_to_host ); } diff --git a/src/terminal/terminaldisplay.cc b/src/terminal/terminaldisplay.cc index 02b1ce9..e7595c2 100644 --- a/src/terminal/terminaldisplay.cc +++ b/src/terminal/terminaldisplay.cc @@ -227,7 +227,8 @@ std::string Display::new_frame( bool initialized, const Framebuffer &last, const /* Common case: if we're already on the bottom line and we're scrolling the whole * screen, just do a CR and LFs. */ - if ( (scroll_height + lines_scrolled == f.ds.get_height() ) && frame.cursor_y + 1 == f.ds.get_height() ) { + if ( scroll_height + lines_scrolled == f.ds.get_height() + && frame.cursor_y + 1 == f.ds.get_height() ) { frame.append( '\r' ); frame.append( lines_scrolled, '\n' ); frame.cursor_x = 0; diff --git a/src/terminal/terminalfunctions.cc b/src/terminal/terminalfunctions.cc index a25f927..87cb95c 100644 --- a/src/terminal/terminalfunctions.cc +++ b/src/terminal/terminalfunctions.cc @@ -584,8 +584,8 @@ void Dispatcher::OSC_dispatch( const Parser::OSC_End *act __attribute((unused)), cmd_num = OSC_string[ 0 ] - L'0'; offset = 2; } - bool set_icon = (cmd_num == 0 || cmd_num == 1); - bool set_title = (cmd_num == 0 || cmd_num == 2); + bool set_icon = cmd_num == 0 || cmd_num == 1; + bool set_title = cmd_num == 0 || cmd_num == 2; if ( set_icon || set_title ) { fb->set_title_initialized(); int title_length = min(OSC_string.size(), (size_t)256);