Eliminate unnecessary, trailing else conditional blocks.

2016-11-07 00:43:33 -05:00
parent 43785eb820
commit b1a6f7c144
7 changed files with 38 additions and 50 deletions
@@ -52,17 +52,14 @@ string UserInput::input( const Parser::UserByte *act,
      state = ESC;
    }
    return string( &act->c, 1 );
-    break;

  case ESC:
    if ( act->c == 'O' ) { /* ESC O = 7-bit SS3 */
      state = SS3;
      return string();
-    } else {
-      state = Ground;
-      return string( &act->c, 1 );
    }
-    break;
+    state = Ground;
+    return string( &act->c, 1 );

  case SS3:
    state = Ground;
@@ -75,12 +72,11 @@ string UserInput::input( const Parser::UserByte *act,
      char original_cursor[ 2 ] = { 'O', act->c };
      return string( original_cursor, 2 );
    }
-    break;
+
+  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();
  }
-
-  /* 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();
 }