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
@@ -51,9 +51,8 @@ const string LocaleVar::str( void ) const
 {
  if ( name.empty() ) {
    return string( "[no charset variables]" );
-  } else {
-    return name + "=" + value;
  }
+  return name + "=" + value;
 }

 const LocaleVar get_ctype( void )
@@ -65,9 +64,8 @@ const LocaleVar get_ctype( void )
    return LocaleVar( "LC_CTYPE", ctype );
  } else if ( const char *lang = getenv( "LANG" ) ) {
    return LocaleVar( "LANG", lang );
-  } else {
-    return LocaleVar( "", "" );
  }
+  return LocaleVar( "", "" );
 }

 const char *locale_charset( void )