Merge changes from topic "lshal_released" am: 757fd44b93

am: 880df0f744

Change-Id: Iff081ead4bb8dc83c2ba982627edacd22dc007dd

1 files changed, 20 insertions, 49 deletions

diff --git a/cmds/lshal/TableEntry.cpp b/cmds/lshal/TableEntry.cpp
index eac0f2144a..cbcf979f90 100644
--- a/cmds/lshal/TableEntry.cpp
+++ b/cmds/lshal/TableEntry.cpp
@@ -44,73 +44,44 @@ static const std::string &getArchString(Architecture arch) {
 
 static std::string getTitle(TableColumnType type) {
     switch (type) {
-        case TableColumnType::INTERFACE_NAME: {
-            return "Interface";
-        } break;
-        case TableColumnType::TRANSPORT: {
-            return "Transport";
-        } break;
-        case TableColumnType::SERVER_PID: {
-            return "Server";
-        } break;
-        case TableColumnType::SERVER_CMD: {
-            return "Server CMD";
-        }
-        case TableColumnType::SERVER_ADDR: {
-            return "PTR";
-        } break;
-        case TableColumnType::CLIENT_PIDS: {
-            return "Clients";
-        } break;
-        case TableColumnType::CLIENT_CMDS: {
-            return "Clients CMD";
-        } break;
-        case TableColumnType::ARCH: {
-            return "Arch";
-        } break;
-        case TableColumnType::THREADS: {
-            return "Thread Use";
-        } break;
-        default: {
+        case TableColumnType::INTERFACE_NAME:   return "Interface";
+        case TableColumnType::TRANSPORT:        return "Transport";
+        case TableColumnType::SERVER_PID:       return "Server";
+        case TableColumnType::SERVER_CMD:       return "Server CMD";
+        case TableColumnType::SERVER_ADDR:      return "PTR";
+        case TableColumnType::CLIENT_PIDS:      return "Clients";
+        case TableColumnType::CLIENT_CMDS:      return "Clients CMD";
+        case TableColumnType::ARCH:             return "Arch";
+        case TableColumnType::THREADS:          return "Thread Use";
+        default:
             LOG(FATAL) << "Should not reach here.";
             return "";
-        }
     }
 }
 
 std::string TableEntry::getField(TableColumnType type) const {
     switch (type) {
-        case TableColumnType::INTERFACE_NAME: {
+        case TableColumnType::INTERFACE_NAME:
             return interfaceName;
-        } break;
-        case TableColumnType::TRANSPORT: {
+        case TableColumnType::TRANSPORT:
             return transport;
-        } break;
-        case TableColumnType::SERVER_PID: {
+        case TableColumnType::SERVER_PID:
             return serverPid == NO_PID ? "N/A" : std::to_string(serverPid);
-        } break;
-        case TableColumnType::SERVER_CMD: {
+        case TableColumnType::SERVER_CMD:
             return serverCmdline;
-        } break;
-        case TableColumnType::SERVER_ADDR: {
+        case TableColumnType::SERVER_ADDR:
             return serverObjectAddress == NO_PTR ? "N/A" : toHexString(serverObjectAddress);
-        } break;
-        case TableColumnType::CLIENT_PIDS: {
+        case TableColumnType::CLIENT_PIDS:
             return join(clientPids, " ");
-        } break;
-        case TableColumnType::CLIENT_CMDS: {
+        case TableColumnType::CLIENT_CMDS:
             return join(clientCmdlines, ";");
-        } break;
-        case TableColumnType::ARCH: {
+        case TableColumnType::ARCH:
             return getArchString(arch);
-        } break;
-        case TableColumnType::THREADS: {
+        case TableColumnType::THREADS:
             return getThreadUsage();
-        } break;
-        default: {
+        default:
             LOG(FATAL) << "Should not reach here.";
             return "";
-        }
     }
 }