Eliminate unnecessary, trailing else conditional blocks.

src/util/locale_utils.cc

@@ -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 )

src/util/swrite.cc

@@ -46,9 +46,8 @@ int swrite( int fd, const char *str, ssize_t len )
     if ( bytes_written <= 0 ) {
       perror( "write" );
       return -1;
-    } else {
-      total_bytes_written += bytes_written;
     }
+    total_bytes_written += bytes_written;
   }
 
   return 0;