aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/crypto/crypto.h4
-rw-r--r--src/frontend/mosh-client.cc6
-rw-r--r--src/frontend/mosh-server.cc12
-rw-r--r--src/network/network.cc4
-rw-r--r--src/terminal/parser.cc2
-rw-r--r--src/terminal/terminalframebuffer.h2
-rw-r--r--src/tests/encrypt-decrypt.cc4
7 files changed, 17 insertions, 17 deletions
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index 1e467a6..fdf3a2f 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -74,8 +74,8 @@ namespace Crypto {
private:
/* Not implemented */
- AlignedBuffer( const AlignedBuffer& );
- AlignedBuffer& operator=( const AlignedBuffer& );
+ AlignedBuffer( const AlignedBuffer & );
+ AlignedBuffer & operator=( const AlignedBuffer & );
};
class Base64Key {
diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc
index b7715df..9f48dfc 100644
--- a/src/frontend/mosh-client.cc
+++ b/src/frontend/mosh-client.cc
@@ -175,13 +175,13 @@ int main( int argc, char *argv[] )
}
client.shutdown();
- } catch ( const Network::NetworkException& e ) {
+ } catch ( const Network::NetworkException &e ) {
fprintf( stderr, "Network exception: %s\r\n",
e.what() );
- } catch ( const Crypto::CryptoException& e ) {
+ } catch ( const Crypto::CryptoException &e ) {
fprintf( stderr, "Crypto exception: %s\r\n",
e.what() );
- } catch ( const std::string& s ) {
+ } catch ( const std::string &s ) {
fprintf( stderr, "Error: %s\r\n", s.c_str() );
}
diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
index f2b22d1..f14f9c2 100644
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -310,11 +310,11 @@ int main( int argc, char *argv[] )
try {
return run_server( desired_ip, desired_port, command_path, command_argv, colors, verbose, with_motd );
- } catch ( const Network::NetworkException& e ) {
+ } catch ( const Network::NetworkException &e ) {
fprintf( stderr, "Network exception: %s\n",
e.what() );
return 1;
- } catch ( const Crypto::CryptoException& e ) {
+ } catch ( const Crypto::CryptoException &e ) {
fprintf( stderr, "Crypto exception: %s\n",
e.what() );
return 1;
@@ -490,10 +490,10 @@ int run_server( const char *desired_ip, const char *desired_port,
try {
serve( master, terminal, *network );
- } catch ( const Network::NetworkException& e ) {
+ } catch ( const Network::NetworkException &e ) {
fprintf( stderr, "Network exception: %s\n",
e.what() );
- } catch ( const Crypto::CryptoException& e ) {
+ } catch ( const Crypto::CryptoException &e ) {
fprintf( stderr, "Crypto exception: %s\n",
e.what() );
}
@@ -726,10 +726,10 @@ void serve( int host_fd, Terminal::Complete &terminal, ServerConnection &network
}
network.tick();
- } catch ( const Network::NetworkException& e ) {
+ } catch ( const Network::NetworkException &e ) {
fprintf( stderr, "%s\n", e.what() );
spin();
- } catch ( const Crypto::CryptoException& e ) {
+ } catch ( const Crypto::CryptoException &e ) {
if ( e.fatal ) {
throw;
} else {
diff --git a/src/network/network.cc b/src/network/network.cc
index 03db52f..9bc823c 100644
--- a/src/network/network.cc
+++ b/src/network/network.cc
@@ -259,7 +259,7 @@ Connection::Connection( const char *desired_ip, const char *desired_port ) /* se
if ( desired_ip ) {
try {
if ( try_bind( desired_ip, desired_port_low, desired_port_high ) ) { return; }
- } catch ( const NetworkException& e ) {
+ } catch ( const NetworkException &e ) {
fprintf( stderr, "Error binding to IP %s: %s\n",
desired_ip,
e.what() );
@@ -269,7 +269,7 @@ Connection::Connection( const char *desired_ip, const char *desired_port ) /* se
/* now try any local interface */
try {
if ( try_bind( NULL, desired_port_low, desired_port_high ) ) { return; }
- } catch ( const NetworkException& e ) {
+ } catch ( const NetworkException &e ) {
fprintf( stderr, "Error binding to any interface: %s\n",
e.what() );
throw; /* this time it's fatal */
diff --git a/src/terminal/parser.cc b/src/terminal/parser.cc
index 524bad5..32bd5b8 100644
--- a/src/terminal/parser.cc
+++ b/src/terminal/parser.cc
@@ -41,7 +41,7 @@
const Parser::StateFamily Parser::family;
static void append_or_delete( Parser::Action *act,
- std::list<Parser::Action *>&vec )
+ std::list<Parser::Action *> &vec )
{
assert( act );
diff --git a/src/terminal/terminalframebuffer.h b/src/terminal/terminalframebuffer.h
index eeb5dc4..497a49e 100644
--- a/src/terminal/terminalframebuffer.h
+++ b/src/terminal/terminalframebuffer.h
@@ -111,7 +111,7 @@ namespace Terminal {
|| (contents.front() == 0xA0) ) ) );
}
- bool contents_match ( const Cell& other ) const
+ bool contents_match ( const Cell &other ) const
{
return ( is_blank() && other.is_blank() )
|| ( contents == other.contents );
diff --git a/src/tests/encrypt-decrypt.cc b/src/tests/encrypt-decrypt.cc
index 1f82a48..fc92778 100644
--- a/src/tests/encrypt-decrypt.cc
+++ b/src/tests/encrypt-decrypt.cc
@@ -72,7 +72,7 @@ void test_bad_decrypt( Session &decryption_session ) {
bool got_exn = false;
try {
decryption_session.decrypt( bad_ct );
- } catch ( const CryptoException& e ) {
+ } catch ( const CryptoException &e ) {
got_exn = true;
/* The "bad decrypt" exception needs to be non-fatal, otherwise we are
@@ -142,7 +142,7 @@ int main( int argc, char *argv[] ) {
for ( size_t i=0; i<NUM_SESSIONS; i++ ) {
try {
test_one_session();
- } catch ( const CryptoException& e ) {
+ } catch ( const CryptoException &e ) {
fprintf( stderr, "Crypto exception: %s\r\n",
e.what() );
fatal_assert( false );