7 files changed, 4 insertions, 14 deletions
diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc
index d47f936..4da5846 100644
--- a/src/frontend/terminaloverlay.cc
+++ b/src/frontend/terminaloverlay.cc
@@ -126,7 +126,6 @@ Validity ConditionalCursorMove::get_validity( const Framebuffer &fb,
 
   if ( (row >= fb.ds.get_height())
        || (col >= fb.ds.get_width()) ) {
-    //    assert( false );
     //    fprintf( stderr, "Crazy cursor (%d,%d)!\n", row, col );
     return IncorrectOrExpired;
   }
@@ -299,9 +298,8 @@ void NotificationEngine::apply( Framebuffer &fb ) const
       }
       break;
     case -1: /* unprintable character */
+    default: /* Bogus width, ignore. */
       break;
-    default:
-      assert( false );
     }
   }
 }
diff --git a/src/network/network.cc b/src/network/network.cc
index aa6f36e..7b1d8fa 100644
--- a/src/network/network.cc
+++ b/src/network/network.cc
@@ -286,7 +286,6 @@ Connection::Connection( const char *desired_ip, const char *desired_port ) /* se
     throw; /* this time it's fatal */
   }
 
-  assert( false );
   throw NetworkException( "Could not bind", errno );
 }
 
@@ -352,7 +351,6 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high )
     }
   }
 
-  assert( false );
   return false;
 }
 
@@ -458,7 +456,6 @@ string Connection::recv( void )
     prune_sockets();
     return payload;
   }
-  assert( false );
   return "";
 }
 
diff --git a/src/statesync/user.cc b/src/statesync/user.cc
index 4f99fee..93f61b3 100644
--- a/src/statesync/user.cc
+++ b/src/statesync/user.cc
@@ -95,7 +95,6 @@ string UserStream::diff_from( const UserStream &existing ) const
       }
       break;
     default:
-      assert( false );
       break;
     }
 
@@ -131,7 +130,6 @@ const Parser::Action &UserStream::get_action( unsigned int i ) const
   case ResizeType:
     return actions[ i ].resize;
   default:
-    assert( false );
     static const Parser::Ignore nothing = Parser::Ignore();
     return nothing;
   }
diff --git a/src/statesync/user.h b/src/statesync/user.h
index 49f26aa..e9e21e0 100644
--- a/src/statesync/user.h
+++ b/src/statesync/user.h
@@ -85,7 +85,7 @@ namespace Network {
     /* interface for Network::Transport */
     void subtract( const UserStream *prefix );
     string diff_from( const UserStream &existing ) const;
-    string init_diff( void ) const { assert( false ); return string(); };
+    string init_diff( void ) const { return string(); };
     void apply_string( const string &diff );
     bool operator==( const UserStream &x ) const { return actions == x.actions; }
 
diff --git a/src/terminal/terminal.cc b/src/terminal/terminal.cc
index af7d2bf..91fa9f6 100644
--- a/src/terminal/terminal.cc
+++ b/src/terminal/terminal.cc
@@ -140,9 +140,7 @@ void Emulator::print( const Parser::Print *act )
     }
     break;
   case -1: /* unprintable character */
-    break;
-  default:
-    assert( false );
+  default: /* bogus width, ignore */
     break;
   }
 }
diff --git a/src/terminal/terminaluserinput.cc b/src/terminal/terminaluserinput.cc
index 84d76f0..3f3142f 100644
--- a/src/terminal/terminaluserinput.cc
+++ b/src/terminal/terminaluserinput.cc
@@ -76,7 +76,6 @@ string UserInput::input( const Parser::UserByte *act,
   default:
     /* This doesn't handle the 8-bit SS3 C1 control, which would be
        two octets in UTF-8. Fortunately nobody seems to send this. */
-    assert( false );
     return string();
   }
 }
diff --git a/src/tests/encrypt-decrypt.cc b/src/tests/encrypt-decrypt.cc
index 10104ae..218ef8e 100644
--- a/src/tests/encrypt-decrypt.cc
+++ b/src/tests/encrypt-decrypt.cc
@@ -144,7 +144,7 @@ int main( int argc, char *argv[] ) {
     } catch ( const CryptoException &e ) {
       fprintf( stderr, "Crypto exception: %s\r\n",
                e.what() );
-      fatal_assert( false );
+      return 1;
     }
   }