HPCC-10821 minor changes

Move WsSMCStatusServerTypeNames definition close to WsSMCStatusServerType;
Check WsSMCSSTterm before testing a WsSMCStatusServerType.

esp/services/ws_smc/ws_smcService.cpp

@@ -1292,13 +1292,9 @@ bool CWsSMCEx::onActivity(IEspContext &context, IEspActivityRequest &req, IEspAc
     return true;
 }
 
-const char *WsSMCStatusServerTypeNames[] = { "ThorMaster", "RoxieServer", "HThorServer", "ECLagent" };
-
 const char *CWsSMCEx::getStatusServerTypeName(WsSMCStatusServerType type)
 {
-    if (type < sizeof(WsSMCStatusServerTypeNames)/sizeof(char *))
-        return WsSMCStatusServerTypeNames[type];
-    return NULL;
+    return (type < WsSMCSSTterm) ? WsSMCStatusServerTypeNames[type] : NULL;
 }
 
 void CWsSMCEx::readTargetClusterInfo(IEspContext &context, CConstWUClusterInfoArray& clusters, IPropertyTree* serverStatusRoot,

esp/services/ws_smc/ws_smcService.hpp

@@ -50,6 +50,8 @@ enum WsSMCStatusServerType
     WsSMCSSTterm = 4
 };
 
+static const char *WsSMCStatusServerTypeNames[] = { "ThorMaster", "RoxieServer", "HThorServer", "ECLagent" };
+
 class CWsSMCQueue
 {
 public: