HPCC-12622 Deprecate sget()

Signed-off-by: jamienoss <james.noss@lexisnexis.com>

common/thorhelper/roxiehelper.cpp

@@ -1046,7 +1046,7 @@ void FlushingStringBuffer::startDataset(const char *elementName, const char *res
                 s.append('<').append(elementName);
                 if (isSoap && (resultName || (sequence != (unsigned) -1)))
                 {
-                    s.append(" xmlns=\'urn:hpccsystems:ecl:").appendLower(queryName.length(), queryName.sget()).append(":result:");
+                    s.append(" xmlns=\'urn:hpccsystems:ecl:").appendLower(queryName.length(), queryName.str()).append(":result:");
                     if (resultName && *resultName)
                         s.appendLower(strlen(resultName), resultName).append('\'');
                     else
@@ -1094,7 +1094,7 @@ void FlushingStringBuffer::startScalar(const char *resultName, unsigned sequence
             s.append("<Dataset");
             if (isSoap && (resultName || (sequence != (unsigned) -1)))
             {
-                s.append(" xmlns=\'urn:hpccsystems:ecl:").appendLower(queryName.length(), queryName.sget()).append(":result:");
+                s.append(" xmlns=\'urn:hpccsystems:ecl:").appendLower(queryName.length(), queryName.str()).append(":result:");
                 if (resultName && *resultName)
                     s.appendLower(strlen(resultName), resultName).append('\'');
                 else

common/thorhelper/roxiehelper.hpp

@@ -49,12 +49,12 @@ public:
     HttpHelper() { _isHttp = false; };
     bool isHttp() { return _isHttp; };
     void setIsHttp(bool __isHttp) { _isHttp = __isHttp; };
-    const char *queryAuthToken() { return authToken.sget(); };
+    const char *queryAuthToken() { return authToken.str(); };
     inline void setAuthToken(const char *v)
     {
         setHttpHeaderValue(authToken, v, false);
     };
-    const char *queryContentType() { return contentType.sget(); };
+    const char *queryContentType() { return contentType.str(); };
     inline void setContentType(const char *v)
     {
         setHttpHeaderValue(contentType, v, true);

common/workunit/package.cpp

@@ -132,7 +132,7 @@ bool CPackageNode::validate(StringArray &warn, StringArray &err) const
 
         if (!super.hasProp("SubFile"))
         {
-            VStringBuffer msg("Package['%s']/SuperFile['%s'] has no SubFiles defined", packageId.sget(), superId.sget());
+            VStringBuffer msg("Package['%s']/SuperFile['%s'] has no SubFiles defined", packageId.str(), superId.str());
             warn.append(msg.str());
         }
     }

common/workunit/pkgimpl.hpp

@@ -446,7 +446,7 @@ public:
         MapStringTo<bool> referencedPackages;
         Owned<IPropertyTree> qs = getQueryRegistry(querySet, true);
         if (!qs)
-            throw MakeStringException(PACKAGE_TARGET_NOT_FOUND, "Target %s not found", querySet.sget());
+            throw MakeStringException(PACKAGE_TARGET_NOT_FOUND, "Target %s not found", querySet.str());
         HashIterator it(packages);
         ForEach (it)
         {
@@ -482,7 +482,7 @@ public:
                     tempQuerySet->addPropTree("Query", queryEntry.getClear());
                 else
                 {
-                    VStringBuffer msg("Query %s not found in %s queryset", queriesToCheck.item(i), querySet.sget());
+                    VStringBuffer msg("Query %s not found in %s queryset", queriesToCheck.item(i), querySet.str());
                     err.append(msg);
                 }
             }

common/wuwebview/wuwebview.cpp

@@ -226,7 +226,7 @@ public:
             if (flags & WWV_ADD_RESULTS_TAG)
                 buffer.append("</Results>");
             if (flags & WWV_ADD_RESPONSE_TAG)
-                buffer.appendf("</%sResponse>", name.sget());
+                buffer.appendf("</%sResponse>", name.str());
             if (flags & WWV_ADD_SOAP)
                 buffer.append("</soap:Body></soap:Envelope>");
             finalized=true;

dali/base/dadfs.cpp

@@ -4552,7 +4552,7 @@ class CDistributedSuperFile: public CDistributedFileBase<IDistributedSuperFile>
                 {
                     sub.setown(transaction->lookupFile(subfile,SDS_SUB_LOCK_TIMEOUT));
                     if (!sub)
-                        throw MakeStringException(-1,"cAddSubFileAction: sub file %s not found", subfile.sget());
+                        throw MakeStringException(-1,"cAddSubFileAction: sub file %s not found", subfile.str());
                     // Must validate before locking for update below, to check sub is not already in parent (and therefore locked already)
                     transaction->validateAddSubFile(parent, sub, subfile);
                 }
@@ -9536,7 +9536,7 @@ public:
         bool includesuper = false;
         StringAttr attr;
         mb.read(wildname).read(recursive).read(attr);
-        trc.appendf("iterateFiles(%s,%s,%s)",wildname.sget(),recursive?"recursive":"",attr.sget());
+        trc.appendf("iterateFiles(%s,%s,%s)",wildname.str(),recursive?"recursive":"",attr.str());
         if (queryTransactionLogging())
             transactionLog.log("%s", trc.str());
         Owned<IUserDescriptor> udesc;
@@ -9592,7 +9592,7 @@ public:
         StringAttr filters;
         bool recursive;
         mb.read(filters).read(recursive);
-        trc.appendf("iterateFilteredFiles(%s,%s)",filters.sget(),recursive?"recursive":"");
+        trc.appendf("iterateFilteredFiles(%s,%s)",filters.str(),recursive?"recursive":"");
         if (queryTransactionLogging())
             transactionLog.log("%s", trc.str());
         if (mb.getPos()<mb.length())
@@ -9651,7 +9651,7 @@ public:
         mb.read(primary).read(secondary).read(primflds).read(secflds).read(kind).read(cardinality).read(payloadb);
         mb.clear();
         bool payload = (payloadb==1);
-        trc.appendf("iterateRelationships(%s,%s,%s,%s,%s,%s,%d)",primary.sget(),secondary.sget(),primflds.sget(),secflds.sget(),kind.sget(),cardinality.sget(),(int)payloadb);
+        trc.appendf("iterateRelationships(%s,%s,%s,%s,%s,%s,%d)",primary.str(),secondary.str(),primflds.str(),secflds.str(),kind.str(),cardinality.str(),(int)payloadb);
         if (queryTransactionLogging())
             transactionLog.log("%s", trc.str());
         unsigned start = msTick();
@@ -9682,7 +9682,7 @@ public:
         mb.read(lname);
         CDateTime dt;
         dt.deserialize(mb);
-        trc.appendf("setFileAccessed(%s)",lname.sget());
+        trc.appendf("setFileAccessed(%s)",lname.str());
         Owned<IUserDescriptor> udesc;
         if (mb.getPos()<mb.length()) {
             udesc.setown(createUserDescriptor());
@@ -9713,7 +9713,7 @@ public:
         StringAttr owner;
         bool set;
         mb.read(lname).read(owner).read(set);
-        trc.appendf("setFileProtect(%s,%s,%s)",lname.sget(),owner.sget(),set?"true":"false");
+        trc.appendf("setFileProtect(%s,%s,%s)",lname.str(),owner.str(),set?"true":"false");
         if (queryTransactionLogging())
             transactionLog.log("%s", trc.str());
         Owned<IUserDescriptor> udesc;
@@ -9756,7 +9756,7 @@ public:
                 ver = 0;
             }
         }
-        trc.appendf("getFileTree(%s,%d)",lname.sget(),ver);
+        trc.appendf("getFileTree(%s,%d)",lname.str(),ver);
         if (queryTransactionLogging())
             transactionLog.log("%s", trc.str());
         Owned<IUserDescriptor> udesc;
@@ -9830,7 +9830,7 @@ public:
         StringAttr gname;
         mb.read(gname);
         mb.clear();
-        trc.appendf("getGroupTree(%s)",gname.sget());
+        trc.appendf("getGroupTree(%s)",gname.str());
         if (queryTransactionLogging())
             transactionLog.log("%s", trc.str());
         byte ok;

dali/base/dafdesc.cpp

@@ -1025,7 +1025,7 @@ class CFileDescriptor:  public CFileDescriptorBase, implements ISuperFileDescrip
         else
             splitDirTail(part0.overridename,dir);
         if (dir.length()==0) {
-            WARNLOG("CFileDescriptor cannot determine directory for file %s in '%s'",tracename.sget(),part0.overridename.sget());
+            WARNLOG("CFileDescriptor cannot determine directory for file %s in '%s'",tracename.str(),part0.overridename.str());
         }
         else {
             const char *s = dir.str();

dali/ft/filecopy.cpp

@@ -944,7 +944,7 @@ void FileSprayer::calculateOne2OnePartition()
     if (!srcFormat.equals(tgtFormat))
        throwError(DFTERR_ReplicateSameFormat);
 
-    if (compressedInput && compressOutput && (strcmp(encryptKey.sget(),decryptKey.sget())==0))
+    if (compressedInput && compressOutput && (strcmp(encryptKey.str(),decryptKey.str())==0))
         setCopyCompressedRaw();                 
 
     ForEachItemIn(idx, sources)

dali/sasha/saarch.cpp

@@ -779,7 +779,7 @@ class CWorkUnitArchiver: public CBranchArchiver
                     e.setPropBool("@archiveError", false);
 #ifdef _DEBUG
                 if (iserr)
-                    PROGLOG("ARCHIVE: Err(%s) date %s",wuid.sget(),dts.str()); 
+                    PROGLOG("ARCHIVE: Err(%s) date %s",wuid.str(),dts.str());
 #endif
             }
             getWorkUnitCreateTime(wuid,time);
@@ -802,7 +802,7 @@ class CWorkUnitArchiver: public CBranchArchiver
                 time.getDateString(s1);
                 StringBuffer s2;
                 ct.getDateString(s2);
-                PROGLOG("ARCHIVE: %s recent date %s %s",wuid.sget(),s1.str(),s2.str());
+                PROGLOG("ARCHIVE: %s recent date %s %s",wuid.str(),s1.str(),s2.str());
             }
 #endif
         }

deployment/deploy/DeployTask.cpp

@@ -189,24 +189,24 @@ public:
 
   const char* getSSHUser() const
   {
-    return m_sshUser.sget();
+    return m_sshUser.str();
   }
   
   const char* getSSHKeyFile() const
   {
-    return m_sshKeyFile.sget();
+    return m_sshKeyFile.str();
   }
 
   const char* getSSHKeyPassphrase() const
   {
-    return m_sshKeyPassphrase.sget();
+    return m_sshKeyPassphrase.str();
   }
 
   bool checkSSHFileExists(const char* filename) const
   {
     bool flag = false;
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Ensure Path", m_processType, m_compName, 
-      m_instanceName, filename, NULL, m_sshUser.sget(), m_sshKeyFile.sget(), m_sshKeyPassphrase.sget(),
+      m_instanceName, filename, NULL, m_sshUser.str(), m_sshKeyFile.str(), m_sshKeyPassphrase.str(),
       true, m_machineOS);
 
     try
@@ -408,8 +408,8 @@ public:
              if (flag)
              {
                Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Copy File", 
-                 m_processType, m_compName, m_instanceName, sb.str(), target, m_sshUser.sget(), 
-                 m_sshKeyFile.sget(), m_sshKeyPassphrase.sget(), true, m_machineOS);
+                 m_processType, m_compName, m_instanceName, sb.str(), target, m_sshUser.str(),
+                 m_sshKeyFile.str(), m_sshKeyPassphrase.str(), true, m_machineOS);
 
                try
                {
@@ -637,7 +637,7 @@ public:
            
            stripNetAddr(target, destpath, ip);
            cmdline.appendf("pscp -p -noagent -q %s -i %s -l %s %s \"%s\" %s:%s", flag?"-r":"",
-             m_sshKeyFile.sget(), m_sshUser.sget(), passphr.str(), source, ip.str(), destpath.str());
+             m_sshKeyFile.str(), m_sshUser.str(), passphr.str(), source, ip.str(), destpath.str());
            retcode = pipeSSHCmd(cmdline.str(), outbuf, errbuf);
 
            if (retcode)
@@ -659,7 +659,7 @@ public:
                copyProgress.onProgress(pSrcFile->size(), pSrcFile->size());
 
              Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Chmod", m_processType, m_compName, m_instanceName, 
-               destpath.str(), NULL, m_sshUser.sget(), m_sshKeyFile.sget(), m_sshKeyPassphrase.sget(), true, m_machineOS);
+               destpath.str(), NULL, m_sshUser.str(), m_sshKeyFile.str(), m_sshKeyPassphrase.str(), true, m_machineOS);
 
              try
              {
@@ -1045,7 +1045,7 @@ public:
           stripNetAddr(target, destpath, ip);
           StringBuffer passphr;
           getKeyPassphrase(passphr);
-          cmdline.appendf("plink -i %s -l %s %s %s md5sum %s", m_sshKeyFile.sget(), m_sshUser.sget(), passphr.str(), ip.str(), destpath.str());
+          cmdline.appendf("plink -i %s -l %s %s %s md5sum %s", m_sshKeyFile.str(), m_sshUser.str(), passphr.str(), ip.str(), destpath.str());
           retcode = pipeSSHCmd(cmdline, outbuf, errbuf);
           m_processed = true;
 
@@ -1165,8 +1165,8 @@ public:
                             stripNetAddr(path, destpath, ip);
                             StringBuffer passphr;
                             getKeyPassphrase(passphr);
-                            cmdline.appendf("plink -i %s -l %s %s %s %s %s", m_sshKeyFile.sget(),
-                              m_sshUser.sget(), passphr.str(), ip.str(), "mkdir -p", destpath.str());
+                            cmdline.appendf("plink -i %s -l %s %s %s %s %s", m_sshKeyFile.str(),
+                              m_sshUser.str(), passphr.str(), ip.str(), "mkdir -p", destpath.str());
                             retcode = pipeSSHCmd(cmdline.str(), outbuf, errbuf);
 
                             if (retcode && retcode != 1)
@@ -1582,7 +1582,7 @@ public:
      StringBuffer cmdline;
      StringBuffer passphr;
      getKeyPassphrase(passphr);
-     cmdline.appendf("plink -i %s -l %s %s %s %s", m_sshKeyFile.sget(), m_sshUser.sget(), passphr.str(), ip, cmd);
+     cmdline.appendf("plink -i %s -l %s %s %s %s", m_sshKeyFile.str(), m_sshUser.str(), passphr.str(), ip, cmd);
      retcode = pipeSSHCmd(cmdline.str(), output, errmsg);
      m_processed = true;
 
@@ -1969,7 +1969,7 @@ private:
     else
     {
       StringBuffer sb;
-      decrypt(sb, m_sshKeyPassphrase.sget());
+      decrypt(sb, m_sshKeyPassphrase.str());
       passphr.append(sb.str());
     }
   }

deployment/deploy/DeploymentEngine.cpp

@@ -316,14 +316,14 @@ void CDeploymentEngine::startInstance(IPropertyTree& node, const char* fileName/
         if (!computer || !*computer)
             return;
 
-        const char* dir = hostDir.sget();
+        const char* dir = hostDir.str();
         StringBuffer destpath, destip;
         stripNetAddr(dir, destpath, destip);
 
         StringBuffer cmd, output, err, destdir;
         destdir.append(destpath.length() - 1, destpath.str());
         cmd.clear().appendf("%s%s %s", destpath.str(), fileName, destdir.str());
-        task.set(createDeployTask(*m_pCallback, "Start Instance", m_process.queryName(), m_name.get(), m_curInstance, fileName, dir, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os));
+        task.set(createDeployTask(*m_pCallback, "Start Instance", m_process.queryName(), m_name.get(), m_curInstance, fileName, dir, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os));
         m_pCallback->printStatus(task);
         bool flag = task->execSSHCmd(destip.str(), cmd, output, err);
     }
@@ -341,7 +341,7 @@ void CDeploymentEngine::startInstance(IPropertyTree& node, const char* fileName/
         connectToHost(node);
         task.set(createDeployTask(*m_pCallback, "Start Instance", m_process.queryName(),
                                              m_name.get(), m_curInstance, NULL, startCmd.str(),
-                                             m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os));
+                                             m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os));
         m_pCallback->printStatus(task);
         task->createProcess(true, user, pwd);
     }
@@ -420,13 +420,13 @@ void CDeploymentEngine::stopInstance(IPropertyTree& node, const char* fileName/*
         if (!computer || !*computer)
             return;
 
-        const char* dir = hostDir.sget();
+        const char* dir = hostDir.str();
         StringBuffer destpath, destip;
         stripNetAddr(dir, destpath, destip);
         StringBuffer cmd, output, err, destdir;
         destdir.append(destpath.length() - 1, destpath.str());
         cmd.clear().appendf("%s%s %s", destpath.str(), fileName, destdir.str());
-        task.set(createDeployTask(*m_pCallback, "Stop Instance", m_process.queryName(), m_name.get(), m_curInstance, fileName, dir, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os));
+        task.set(createDeployTask(*m_pCallback, "Stop Instance", m_process.queryName(), m_name.get(), m_curInstance, fileName, dir, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os));
         m_pCallback->printStatus(task);
         bool flag = task->execSSHCmd(destip.str(), cmd, output, err);
     }
@@ -444,8 +444,8 @@ void CDeploymentEngine::stopInstance(IPropertyTree& node, const char* fileName/*
         // Spawn stop process
         connectToHost(node);
         task.set(createDeployTask(*m_pCallback, "Stop Instance", m_process.queryName(), m_name.get(),
-                         m_curInstance, NULL, stopCmd.str(), m_curSSHUser.sget(),
-                         m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os));
+                         m_curInstance, NULL, stopCmd.str(), m_curSSHUser.str(),
+                         m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os));
         m_pCallback->printStatus(task);
         task->createProcess(true, user, pwd);
     }
@@ -721,8 +721,8 @@ void CDeploymentEngine::deleteFile(const char* target, const char* instanceName,
 {
     checkAbort();
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Delete File", m_process.queryName(),
-                                             m_name.get(), instanceName, NULL, target, m_curSSHUser.sget(), m_curSSHKeyFile.sget(),
-                                             m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os);
+                                             m_name.get(), instanceName, NULL, target, m_curSSHUser.str(), m_curSSHKeyFile.str(),
+                                             m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os);
     task->deleteFile();
 
     //only display status info for successful attempts since some temp files may be attempted to be
@@ -756,12 +756,12 @@ void CDeploymentEngine::backupDirs()
                     "Backing up directory %s", hostDir.get());
 
                 StringBuffer bkPath;
-                getBackupDirName(hostDir.sget(), bkPath);
+                getBackupDirName(hostDir.str(), bkPath);
                 if (bkPath.length() == 0)
                     return;
 
                 StringBuffer fromPath, toPath, err, fromip, toip;
-                stripNetAddr(hostDir.sget(), fromPath, fromip);
+                stripNetAddr(hostDir.str(), fromPath, fromip);
                 stripNetAddr(bkPath.str(), toPath, toip);
 
                 StringBuffer cmd, output;
@@ -769,7 +769,7 @@ void CDeploymentEngine::backupDirs()
                 tmp.appendf("%d", msTick());
                 cmd.clear().appendf("cp -r %s %s", fromPath.str(), toPath.str());
                 Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Backup Directory", m_process.queryName(), m_name.get(),
-                    m_curInstance, fromPath.str(), toPath.str(), m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(),
+                    m_curInstance, fromPath.str(), toPath.str(), m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(),
                     m_useSSHIfDefined, os);
                 m_pCallback->printStatus(task);
                 bool flag = task->execSSHCmd(fromip.str(), cmd, output, err);
@@ -851,8 +851,8 @@ void CDeploymentEngine::xslTransform(const char *xslFilePath, const char *output
     s_xsltDepEngine = this; //this is used in external function to get back to deployment engine instance
 
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "XSL Transform", m_process.queryName(),
-        m_name.get(), instanceName, xslFilePath, outputFilePath, m_curSSHUser.sget(), m_curSSHKeyFile.sget(),
-        m_curSSHKeyPassphrase.sget(), useSSH ? m_useSSHIfDefined : useSSH, os, processName);
+        m_name.get(), instanceName, xslFilePath, outputFilePath, m_curSSHUser.str(), m_curSSHKeyFile.str(),
+        m_curSSHKeyPassphrase.str(), useSSH ? m_useSSHIfDefined : useSSH, os, processName);
     m_pCallback->printStatus(task);
 
     if (os == MachineOsLinux)
@@ -925,8 +925,8 @@ void CDeploymentEngine::compareFiles(const char *newFile, const char *oldFile, E
 {
    Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Compare File",
                                               m_process.queryName(), m_name.get(),
-                                              m_curInstance, newFile, oldFile, m_curSSHUser.sget(),
-                                              m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os);
+                                              m_curInstance, newFile, oldFile, m_curSSHUser.str(),
+                                              m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os);
    m_pCallback->printStatus(task);
    task->compareFile(DTC_CRC | DTC_SIZE);
    task->setFileSpec(DT_SOURCE, newFile);
@@ -952,7 +952,7 @@ void CDeploymentEngine::writeFile(const char* filename, const char* str, EnvMach
     else
         ensurePath(filename);
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Create File", m_process.queryName(), m_name.get(),
-        m_curInstance, NULL, filename, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(),
+        m_curInstance, NULL, filename, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(),
         useSSH?m_useSSHIfDefined:useSSH, os);
     m_pCallback->printStatus(task);
     if (useSSH?m_useSSHIfDefined:useSSH)
@@ -1322,7 +1322,7 @@ void CDeploymentEngine::ensurePath(const char* filespec) const
         if ((m_curInstance && m_curSSHUser.length() && m_curSSHKeyFile.length()) || !pIFile->exists() || !pIFile->isDirectory())
         {
             Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Create Directory", m_process.queryName(), m_name.get(),
-                m_curInstance, NULL, dir.str(), m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(),
+                m_curInstance, NULL, dir.str(), m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(),
                 m_useSSHIfDefined, os);
             m_pCallback->printStatus(task);
             task->createDirectory();
@@ -1374,7 +1374,7 @@ void CDeploymentEngine::renameDir(const char* from, const char* to, EnvMachineOS
 
     // Save rename task
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Rename", m_process.queryName(), m_name.get(),
-        m_curInstance, oldPath, newPath, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os);
+        m_curInstance, oldPath, newPath, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os);
 
   m_renameDirList.append(*task.getLink());
 }
@@ -1396,7 +1396,7 @@ void CDeploymentEngine::backupDir(const char* from)
 
     // Copy directory
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Backup Directory", m_process.queryName(), m_name.get(),
-        m_curInstance, fromPath, toPath.str(),  m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined);
+        m_curInstance, fromPath, toPath.str(),  m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined);
     m_pCallback->printStatus(task);
     task->copyDirectory();
     m_pCallback->printStatus(task);
@@ -1517,7 +1517,7 @@ void CDeploymentEngine::copyInstallFiles(const char* instanceName, int instanceI
                       sbdst.setLength(strrchr(sbdst.str(), PATHSEPCHAR) - sbdst.str() + 1);
 
                     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Copy Directory", m_process.queryName(), m_name.get(),
-                      m_curInstance, sbsrc.str(), sbdst.str(), m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os);
+                      m_curInstance, sbsrc.str(), sbdst.str(), m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os);
                     task->setFlags(m_deployFlags & DCFLAGS_ALL);
                     m_threadPool->start(task);
                     recCopyDone = true;
@@ -1665,7 +1665,7 @@ bool CDeploymentEngine::processInstallFile(IPropertyTree& processNode, const cha
                     if (!stricmp(method+4, "_block_until_done")) //copy_block_until_done
                     {
                         Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Copy File", m_process.queryName(), m_name.get(),
-                            m_curInstance, source, dest, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os);
+                            m_curInstance, source, dest, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os);
                         task->setFlags(m_deployFlags & DCFLAGS_ALL);
 
                         task->copyFile( m_deployFlags & (DCFLAGS_ALL | DTC_DEL_WRONG_CASE));
@@ -1677,7 +1677,7 @@ bool CDeploymentEngine::processInstallFile(IPropertyTree& processNode, const cha
                     else
                     {
                         Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Copy File", m_process.queryName(), m_name.get(),
-                            m_curInstance, source, dest, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os);
+                            m_curInstance, source, dest, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os);
                         task->setFlags(m_deployFlags & DCFLAGS_ALL);
 
                         m_threadPool->start(task);//start a thread for this task
@@ -2664,7 +2664,7 @@ bool CDeploymentEngine::checkSSHFileExists(const char* dir) const
     tmp.appendf("%d", msTick());
     cmd.clear().appendf("[ -e %s ] && echo %s", destpath.str(), tmp.str());
     Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Ensure Path", m_process.queryName(), m_name.get(),
-      m_curInstance, NULL, NULL, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined);
+      m_curInstance, NULL, NULL, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined);
     task->execSSHCmd(destip.str(), cmd, output, err);
     flag = strstr(output.str(), tmp.str()) == output.str();
     checkAbort(task);

deployment/deploy/EspDeploymentEngine.cpp

@@ -202,7 +202,7 @@ void CEspDeploymentEngine::xslTransform(
    {
       Owned<IDeployTask> task = 
          createDeployTask(*m_pCallback, "XSL Transform", m_process.queryName(), m_name.get(), 
-                           instanceName, xslFilePath, outputFilePath, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), 
+                           instanceName, xslFilePath, outputFilePath, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(),
                            m_useSSHIfDefined, os, processName);
       m_pCallback->printStatus(task);
       task->transformFile(*m_processor, *m_transform, m_cachePath.get());

deployment/deploy/dalideploymentengine.cpp

@@ -160,9 +160,9 @@ void CDaliDeploymentEngine::compareFiles(const char *newFile, const char *oldFil
     StringBuffer installPath;
     getInstallPath(oldFile, installPath);
 
-   Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Compare File", m_process.queryName(), m_name.get(), 
-     m_curInstance, newFile, installPath.str(), m_curSSHUser.sget(), m_curSSHKeyFile.sget(), 
-     m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined);
+   Owned<IDeployTask> task = createDeployTask(*m_pCallback, "Compare File", m_process.queryName(), m_name.get(),
+     m_curInstance, newFile, installPath.str(), m_curSSHUser.str(), m_curSSHKeyFile.str(),
+     m_curSSHKeyPassphrase.str(), m_useSSHIfDefined);
    m_pCallback->printStatus(task);
    task->compareFile(DTC_CRC | DTC_SIZE);
    m_pCallback->printStatus(task);

deployment/deploy/espconfiggenengine.cpp

@@ -203,7 +203,7 @@ void CEspConfigGenEngine::xslTransform(
    {
       Owned<IDeployTask> task = 
          createDeployTask(*m_pCallback, "XSL Transform", m_process.queryName(), m_name.get(), 
-                           instanceName, xslFilePath, outputFilePath, m_curSSHUser.sget(), m_curSSHKeyFile.sget(), m_curSSHKeyPassphrase.sget(), m_useSSHIfDefined, os, processName);
+                           instanceName, xslFilePath, outputFilePath, m_curSSHUser.str(), m_curSSHKeyFile.str(), m_curSSHKeyPassphrase.str(), m_useSSHIfDefined, os, processName);
       m_pCallback->printStatus(task);
       task->transformFile(*m_processor, *m_transform, m_cachePath.get());
       m_pCallback->printStatus(task);

ecl/ecl-package/ecl-package.cpp

@@ -456,7 +456,7 @@ public:
     }
     virtual int processCMD()
     {
-        fprintf(stdout, "\n ... deleting package map %s now\n\n", optPackageMap.sget());
+        fprintf(stdout, "\n ... deleting package map %s now\n\n", optPackageMap.str());
 
         Owned<IClientWsPackageProcess> packageProcessClient = createCmdClient(WsPackageProcess, *this);
         Owned<IClientDeletePackageRequest> request = packageProcessClient->createDeletePackageRequest();
@@ -582,7 +582,7 @@ public:
         StringBuffer pkgInfo;
         pkgInfo.loadFile(optFileName);
 
-        fprintf(stdout, "\n ... adding package map %s now\n\n", optFileName.sget());
+        fprintf(stdout, "\n ... adding package map %s now\n\n", optFileName.str());
 
         Owned<IClientAddPackageRequest> request = packageProcessClient->createAddPackageRequest();
         request->setActivate(optActivate);
@@ -735,7 +735,7 @@ public:
         {
             StringBuffer pkgInfo;
             pkgInfo.loadFile(optFileName);
-            fprintf(stdout, "\nvalidating packagemap file %s\n\n", optFileName.sget());
+            fprintf(stdout, "\nvalidating packagemap file %s\n\n", optFileName.str());
             request->setInfo(pkgInfo);
         }
 

ecl/eclagent/eclagent.cpp

@@ -612,7 +612,7 @@ const char *EclAgent::queryTempfilePath()
         recursiveCreateDirectory(dir.str());
         agentTempDir.set(dir.str());
     }
-    return agentTempDir.sget();
+    return agentTempDir.str();
 }
 
 StringBuffer & EclAgent::getTempfileBase(StringBuffer & buff)

ecl/eclcmd/eclcmd_common.cpp

@@ -286,7 +286,7 @@ const char *EclObjectParameter::queryTypeName()
 StringBuffer &EclObjectParameter::getDescription(StringBuffer &s)
 {
     s.append(queryTypeName()).append(' ');
-    if (streq(value.sget(), "stdin"))
+    if (streq(value.str(), "stdin"))
         s.append("from ");
     return s.append(value.get());
 }
@@ -321,7 +321,7 @@ eclCmdOptionMatchIndicator EclCmdCommon::matchCommandLineOption(ArgvIterator &it
     if (iter.matchOption(tempArg, "-brk"))
     {
 #if defined(_WIN32) && defined(_DEBUG)
-        unsigned id = atoi(tempArg.sget());
+        unsigned id = atoi(tempArg.str());
         if (id == 0)
             DebugBreak();
         else
@@ -437,7 +437,7 @@ public:
         buildCmd(cmdLine);
 
         Owned<IPipeProcess> pipe = createPipeProcess();
-        bool hasInput = streq(cmd.optObj.value.sget(), "stdin");
+        bool hasInput = streq(cmd.optObj.value.str(), "stdin");
         pipe->run(cmd.optVerbose ? "EXEC" : NULL, cmdLine.str(), NULL, hasInput, true, true);
 
         StringBuffer errors;
@@ -632,7 +632,7 @@ bool EclCmdWithEclTarget::finalizeOptions(IProperties *globals)
 
     if (optObj.type==eclObjTypeUnknown)
     {
-        fprintf(stderr, "\nCan't determine content type of argument %s\n", optObj.value.sget());
+        fprintf(stderr, "\nCan't determine content type of argument %s\n", optObj.value.str());
         return false;
     }
 
@@ -674,7 +674,7 @@ eclCmdOptionMatchIndicator EclCmdWithQueryTarget::matchCommandLineOption(ArgvIte
             optQuerySet.set(optTemp.get());
             return EclCmdOptionMatch;
         }
-        fprintf(stderr, "\nunrecognized argument %s\n", optQuery.sget());
+        fprintf(stderr, "\nunrecognized argument %s\n", optQuery.str());
             return EclCmdOptionCompletion;
     }
     return EclCmdCommon::matchCommandLineOption(iter, true);

ecl/eclcmd/eclcmd_core.cpp

@@ -45,7 +45,7 @@ size32_t getMaxRequestEntityLength(EclCmdCommon &cmd)
     if (cmd.optPassword.length())
          httpclient->setPassword(cmd.optPassword);
      if (0 > httpclient->sendRequest("GET", NULL, request, response, status) || !response.length() || strncmp("200", status, 3))
-         throw MakeStringException(-1, "Error checking ESP configuration: %s:%s %s", cmd.optServer.sget(), cmd.optPort.sget(), status.str());
+         throw MakeStringException(-1, "Error checking ESP configuration: %s:%s %s", cmd.optServer.str(), cmd.optPort.str(), status.str());
 
     Owned<IPropertyTree> config = createPTreeFromXMLString(response);
     return config->getPropInt("Software[1]/EspProcess[1]/EspProtocol[@type='http_protocol'][1]/@maxRequestEntityLength");
@@ -127,7 +127,7 @@ bool doDeploy(EclCmdWithEclTarget &cmd, IClientWsWorkunits *client, const char *
     if (cluster && *cluster)
         req->setCluster(cluster);
     req->setObject(cmd.optObj.mb);
-    req->setFileName(cmd.optObj.value.sget());
+    req->setFileName(cmd.optObj.value.str());
     if ((int)cmd.optResultLimit > 0)
         req->setResultLimit(cmd.optResultLimit);
     if (cmd.optAttributePath.length())
@@ -711,7 +711,7 @@ public:
         else if (results.empty())
             fprintf(stderr, "\nError Empty Result!\n");
         else
-            outputQueryActionResults(results, "Activated", optQuerySet.sget());
+            outputQueryActionResults(results, "Activated", optQuerySet.str());
         return 0;
     }
     virtual void usage()
@@ -758,7 +758,7 @@ public:
         else if (results.empty())
             fprintf(stderr, "\nError Empty Result!\n");
         else
-            outputQueryActionResults(results, "Unpublished", optQuerySet.sget());
+            outputQueryActionResults(results, "Unpublished", optQuerySet.str());
         return 0;
     }
     virtual void usage()
@@ -807,7 +807,7 @@ public:
         {
             IConstQuerySetAliasActionResult &item = results.item(0);
             if (item.getSuccess())
-                fprintf(stdout, "Deactivated alias %s/%s\n", optQuerySet.sget(), optQuery.sget());
+                fprintf(stdout, "Deactivated alias %s/%s\n", optQuerySet.str(), optQuery.str());
             else if (item.getCode()|| item.getMessage())
                 fprintf(stderr, "Error (%d) %s\n", item.getCode(), item.getMessage());
         }

ecl/eclcmd/eclcmd_shell.cpp

@@ -42,7 +42,7 @@ int EclCMDShell::callExternal(ArgvIterator &iter)
 {
     const char *argv[100];
     StringBuffer cmdstr("ecl-");
-    cmdstr.append(cmd.sget());
+    cmdstr.append(cmd.str());
     int i=0;
     argv[i++]=cmdstr.str();
     if (optHelp)
@@ -60,10 +60,10 @@ int EclCMDShell::callExternal(ArgvIterator &iter)
         switch(errno)
         {
         case ENOENT:
-            fprintf(stderr, "ecl '%s' command not found\n", cmd.sget());
+            fprintf(stderr, "ecl '%s' command not found\n", cmd.str());
             return 1;
         default:
-            fprintf(stderr, "ecl '%s' command error %d\n", cmd.sget(), errno);
+            fprintf(stderr, "ecl '%s' command error %d\n", cmd.str(), errno);
             return 1;
         }
     }
@@ -79,7 +79,7 @@ int EclCMDShell::processCMD(ArgvIterator &iter)
         {
             if (runExternals)
                 return callExternal(iter);
-            fprintf(stderr, "ecl '%s' command not found\n", cmd.sget());
+            fprintf(stderr, "ecl '%s' command not found\n", cmd.str());
         }
         usage();
         return 1;
@@ -173,7 +173,7 @@ bool EclCMDShell::parseCommandLineOptions(ArgvIterator &iter)
         if (iter.matchOption(tempArg, "-brk"))
         {
 #if defined(_WIN32) && defined(_DEBUG)
-            unsigned id = atoi(tempArg.sget());
+            unsigned id = atoi(tempArg.str());
             if (id == 0)
                 DebugBreak();
             else

ecl/eclcmd/queries/ecl-queries.cpp

@@ -117,7 +117,7 @@ public:
             StringAttr temp;
             if (iter.matchOption(temp, ECLOPT_SHOW))
             {
-                for (const char *ch = temp.sget(); *ch; ch++)
+                for (const char *ch = temp.str(); *ch; ch++)
                 {
                     switch (*ch)
                     {
@@ -527,7 +527,7 @@ public:
         if (resp->getExceptions().ordinality())
             outputMultiExceptions(resp->getExceptions());
         if (resp->getQueryId() && *resp->getQueryId())
-            fprintf(stdout, "%s/%s\n\n", optTargetQuerySet.sget(), resp->getQueryId());
+            fprintf(stdout, "%s/%s\n\n", optTargetQuerySet.str(), resp->getQueryId());
         return 0;
     }
     virtual void usage()

esp/bindings/SOAP/ws_ecl_client/ws_ecl_client_bind.hpp

@@ -546,7 +546,7 @@ public:
         else
         {
             StringBuffer nsuri("urn:hpccsystems:ws:");
-            nsuri.appendLower(m_method.length(), m_method.sget());          
+            nsuri.appendLower(m_method.length(), m_method.str());
             rpc_request.set_nsuri(nsuri.str());
         }
         

esp/esdllib/esdl_transformer2.cpp

@@ -368,7 +368,7 @@ void Esdl2Base::countContent(Esdl2TransformerContext &ctx)
 
 void Esdl2Base::output_content(Esdl2TransformerContext &ctx, IPropertyTree *pt)
 {
-    output_content(ctx, pt, xml_tag.sget());
+    output_content(ctx, pt, xml_tag.str());
 }
 
 void Esdl2Base::output_content(Esdl2TransformerContext &ctx, const char * content, const char *tagname, unsigned leadinzeros)
@@ -466,7 +466,7 @@ void Esdl2Base::output_content(Esdl2TransformerContext &ctx, const char *tagname
 
 void Esdl2Base::output_content(Esdl2TransformerContext &ctx)
 {
-    output_content(ctx, xml_tag.sget());
+    output_content(ctx, xml_tag.str());
 }
 
 void Esdl2Base::output_ecl_date(Esdl2TransformerContext &ctx, const char *tagname)

esp/services/esdl_svc_engine/esdl_binding.cpp

@@ -866,7 +866,7 @@ void EsdlBindingImpl::initEsdlServiceInfo(IEsdlDefService &srvdef)
     const char *verstr = srvdef.queryProp("default_client_version");
     if (verstr && *verstr)
     {
-        if (atof(verstr) > atof(m_defaultSvcVersion.sget()))
+        if (atof(verstr) > atof(m_defaultSvcVersion.str()))
             m_defaultSvcVersion.set(verstr);
     }
 

esp/services/ws_ecl/ws_ecl_service.cpp

@@ -777,7 +777,7 @@ void buildSampleDataset(StringBuffer &xml, IPropertyTree *xsdtree, const char *s
 void CWsEclBinding::buildSampleResponseXml(StringBuffer& msg, IEspContext &context, CHttpRequest* request, WsEclWuInfo &wsinfo)
 {
     StringBuffer element;
-    element.append(wsinfo.queryname.sget()).append("Response");
+    element.append(wsinfo.queryname.str()).append("Response");
 
     StringBuffer xsds;
     wsinfo.getSchemas(xsds);
@@ -787,7 +787,7 @@ void CWsEclBinding::buildSampleResponseXml(StringBuffer& msg, IEspContext &conte
         msg.append("<?xml-stylesheet type=\"text/xsl\" href=\"/esp/xslt/xmlformatter.xsl\"?>");
 
     msg.append('<').append(element.str()).append(" xmlns=\"urn:hpccsystems:ecl:");
-    msg.appendLower(wsinfo.queryname.length(), wsinfo.queryname.sget()).append("\">");
+    msg.appendLower(wsinfo.queryname.length(), wsinfo.queryname.str()).append("\">");
     msg.append("<Results><Result>");
 
     Owned<IPropertyTree> xsds_tree;
@@ -798,7 +798,7 @@ void CWsEclBinding::buildSampleResponseXml(StringBuffer& msg, IEspContext &conte
     {
         Owned<IPropertyTreeIterator> result_xsds =xsds_tree->getElements("Result");
         ForEach (*result_xsds)
-            buildSampleDataset(msg, result_xsds->query().queryPropTree("xs:schema"), wsinfo.qsetname.sget(), wsinfo.queryname.sget(), result_xsds->query().queryProp("@name"));
+            buildSampleDataset(msg, result_xsds->query().queryPropTree("xs:schema"), wsinfo.qsetname.str(), wsinfo.queryname.str(), result_xsds->query().queryProp("@name"));
     }
 
     msg.append("</Result></Results>");
@@ -811,8 +811,8 @@ int CWsEclBinding::getWsEclLinks(IEspContext &context, CHttpRequest* request, CH
     StringBuffer xml;
     xml.append("<links>");
     xml.append("<version>3</version>");
-    xml.append("<path>").append(wsinfo.qsetname.sget()).append("</path>");
-    xml.append("<query>").append(wsinfo.queryname.sget()).append("</query>");
+    xml.append("<path>").append(wsinfo.qsetname.str()).append("</path>");
+    xml.append("<query>").append(wsinfo.queryname.str()).append("</query>");
 
     StringBuffer xsds;
     wsinfo.getSchemas(xsds);
@@ -879,8 +879,8 @@ int CWsEclBinding::getWsEcl2TabView(CHttpRequest* request, CHttpResponse* respon
     xml.append("<tabview>");
     xml.append("<version>3</version>");
     xml.appendf("<wuid>%s</wuid>", w);
-    xml.appendf("<qset>%s</qset>", wsinfo.qsetname.sget());
-    xml.appendf("<qname>%s</qname>", wsinfo.queryname.sget());
+    xml.appendf("<qset>%s</qset>", wsinfo.qsetname.str());
+    xml.appendf("<qname>%s</qname>", wsinfo.queryname.str());
 
     StringBuffer xsds;
     wsinfo.getSchemas(xsds);
@@ -1123,7 +1123,7 @@ void CWsEclBinding::SOAPSectionToXsd(WsEclWuInfo &wsinfo, const char *parmXml, S
 {
     Owned<IPropertyTree> tree = createPTreeFromXMLString(parmXml);
 
-    schema.appendf("<xsd:element name=\"%s%s\">", wsinfo.queryname.sget(), isRequest ? "Request" : "Response");
+    schema.appendf("<xsd:element name=\"%s%s\">", wsinfo.queryname.str(), isRequest ? "Request" : "Response");
     schema.append("<xsd:complexType>");
     schema.append("<xsd:all>");
     Owned<IPropertyTreeIterator> parts = tree->getElements("part");
@@ -1228,7 +1228,7 @@ int CWsEclBinding::getXsdDefinition(IEspContext &context, CHttpRequest *request,
                 SOAPSectionToXsd(wsinfo, parmXml.str(), content, true, xsdtree);
             }
 
-            content.appendf("<xsd:element name=\"%sResponse\">", wsinfo.queryname.sget());
+            content.appendf("<xsd:element name=\"%sResponse\">", wsinfo.queryname.str());
             content.append("<xsd:complexType>");
             content.append("<xsd:all>");
             content.append("<xsd:element name=\"Exceptions\" type=\"tns:ArrayOfEspException\" minOccurs=\"0\"/>");
@@ -1280,7 +1280,7 @@ bool CWsEclBinding::getSchema(StringBuffer& schema, IEspContext &ctx, CHttpReque
     Owned<IPropertyTreeIterator> nsiter = namespaces->getElements("namespace");
     
     StringBuffer urn("urn:hpccsystems:ecl:");
-    urn.appendLower(wsinfo.queryname.length(), wsinfo.queryname.sget());
+    urn.appendLower(wsinfo.queryname.length(), wsinfo.queryname.str());
     schema.appendf("<xsd:schema elementFormDefault=\"qualified\" targetNamespace=\"%s\" ", urn.str());
     schema.appendf(" xmlns:tns=\"%s\"  xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"", urn.str());
     ForEach(*nsiter)
@@ -1334,8 +1334,8 @@ int CWsEclBinding::getGenForm(IEspContext &context, CHttpRequest* request, CHttp
     StringBuffer v;
     StringBuffer formxml("<FormInfo>");
     appendXMLTag(formxml, "WUID", wsinfo.queryWuid());
-    appendXMLTag(formxml, "QuerySet", wsinfo.qsetname.sget());
-    appendXMLTag(formxml, "QueryName", wsinfo.queryname.sget());
+    appendXMLTag(formxml, "QuerySet", wsinfo.qsetname.str());
+    appendXMLTag(formxml, "QueryName", wsinfo.queryname.str());
     appendXMLTag(formxml, "ClientVersion", v.appendf("%g",context.getClientVersion()).str());
     appendXMLTag(formxml, "RequestElement", v.clear().append(wsinfo.queryname).append("Request").str());
 
@@ -1456,7 +1456,7 @@ void CWsEclBinding::getWsEcl2XmlRequest(StringBuffer& soapmsg, IEspContext &cont
     else
     {
         StringBuffer element;
-        element.append(wsinfo.queryname.sget()).append("Request");
+        element.append(wsinfo.queryname.str()).append("Request");
 
         StringBuffer schemaXml;
         getSchema(schemaXml, context, request, wsinfo);
@@ -1469,7 +1469,7 @@ void CWsEclBinding::getWsEcl2XmlRequest(StringBuffer& soapmsg, IEspContext &cont
             if (type)
             {
                 StringArray parentTypes;
-                buildReqXml(parentTypes, type, soapmsg, (!stricmp(xmltype, "roxiexml")) ? wsinfo.queryname.sget() : element.str(), reqTree, flags|REQSF_ROOT, ns);
+                buildReqXml(parentTypes, type, soapmsg, (!stricmp(xmltype, "roxiexml")) ? wsinfo.queryname.str() : element.str(), reqTree, flags|REQSF_ROOT, ns);
             }
         }
     }
@@ -1492,7 +1492,7 @@ void CWsEclBinding::getWsEclJsonRequest(StringBuffer& jsonmsg, IEspContext &cont
             return;
         }
         StringBuffer element;
-        element.append(wsinfo.queryname.sget());
+        element.append(wsinfo.queryname.str());
             element.append("Request");
 
         StringBuffer schemaXml;
@@ -1506,7 +1506,7 @@ void CWsEclBinding::getWsEclJsonRequest(StringBuffer& jsonmsg, IEspContext &cont
             if (type)
             {
                 StringArray parentTypes;
-                JsonHelpers::buildJsonMsg(parentTypes, type, jsonmsg, wsinfo.queryname.sget(), reqTree, flags|REQSF_ROOT);
+                JsonHelpers::buildJsonMsg(parentTypes, type, jsonmsg, wsinfo.queryname.str(), reqTree, flags|REQSF_ROOT);
             }
         }
     }
@@ -1528,7 +1528,7 @@ void CWsEclBinding::getSoapMessage(StringBuffer& soapmsg, IEspContext &context,
         );
 
     StringBuffer ns;
-    ns.append("xmlns=\"urn:hpccsystems:ecl:").appendLower(wsinfo.queryname.length(), wsinfo.queryname.sget()).append('\"');
+    ns.append("xmlns=\"urn:hpccsystems:ecl:").appendLower(wsinfo.queryname.length(), wsinfo.queryname.str()).append('\"');
     getWsEcl2XmlRequest(soapmsg, context, request, wsinfo, "soap", ns.str(), flags, validate);
 
     soapmsg.append("</soap:Body></soap:Envelope>");
@@ -1595,8 +1595,8 @@ int CWsEclBinding::getXmlTestForm(IEspContext &context, CHttpRequest* request, C
 
     // params
     xform->setStringParameter("pageName", pageName.str());
-    xform->setStringParameter("serviceName", wsinfo.qsetname.sget());
-    xform->setStringParameter("methodName", wsinfo.queryname.sget());
+    xform->setStringParameter("serviceName", wsinfo.qsetname.str());
+    xform->setStringParameter("methodName", wsinfo.queryname.str());
     xform->setStringParameter("wuid", wsinfo.queryWuid());
     xform->setStringParameter("header", header.str());
 
@@ -1647,8 +1647,8 @@ int CWsEclBinding::getJsonTestForm(IEspContext &context, CHttpRequest* request,
 
     // params
     xform->setStringParameter("pageName", pageName.str());
-    xform->setStringParameter("serviceName", wsinfo.qsetname.sget());
-    xform->setStringParameter("methodName", wsinfo.queryname.sget());
+    xform->setStringParameter("serviceName", wsinfo.qsetname.str());
+    xform->setStringParameter("methodName", wsinfo.queryname.str());
     xform->setStringParameter("wuid", wsinfo.queryWuid());
     xform->setStringParameter("header", header.str());
 
@@ -1744,7 +1744,7 @@ int CWsEclBinding::submitWsEclWorkunit(IEspContext & context, WsEclWuInfo &wsinf
 
     workunit->clearExceptions();
     workunit->resetWorkflow();
-    workunit->setClusterName(wsinfo.qsetname.sget());
+    workunit->setClusterName(wsinfo.qsetname.str());
     workunit->setUser(context.queryUserId());
 
     const char *jobname = context.queryRequestParameters()->queryProp("_jobname");
@@ -1772,7 +1772,7 @@ int CWsEclBinding::submitWsEclWorkunit(IEspContext & context, WsEclWuInfo &wsinf
     workunit->schedule();
     workunit.clear();
 
-    runWorkUnit(wuid.str(), wsinfo.qsetname.sget());
+    runWorkUnit(wuid.str(), wsinfo.qsetname.str());
 
     bool async = context.queryRequestParameters()->hasProp("_async");
 
@@ -1971,12 +1971,12 @@ int CWsEclBinding::getWsdlMessages(IEspContext &context, CHttpRequest *request,
     WsEclWuInfo *wsinfo = (WsEclWuInfo *) context.getBindingValue();
     if (wsinfo)
     {
-        content.appendf("<message name=\"%sSoapIn\">", wsinfo->queryname.sget());
-        content.appendf("<part name=\"parameters\" element=\"tns:%sRequest\"/>", wsinfo->queryname.sget());
+        content.appendf("<message name=\"%sSoapIn\">", wsinfo->queryname.str());
+        content.appendf("<part name=\"parameters\" element=\"tns:%sRequest\"/>", wsinfo->queryname.str());
         content.append("</message>");
 
-        content.appendf("<message name=\"%sSoapOut\">", wsinfo->queryname.sget());
-        content.appendf("<part name=\"parameters\" element=\"tns:%sResponse\"/>", wsinfo->queryname.sget());
+        content.appendf("<message name=\"%sSoapOut\">", wsinfo->queryname.str());
+        content.appendf("<part name=\"parameters\" element=\"tns:%sResponse\"/>", wsinfo->queryname.str());
         content.append("</message>");
     }
 
@@ -1988,10 +1988,10 @@ int CWsEclBinding::getWsdlPorts(IEspContext &context, CHttpRequest *request, Str
     WsEclWuInfo *wsinfo = (WsEclWuInfo *) context.getBindingValue();
     if (wsinfo)
     {
-        content.appendf("<portType name=\"%sServiceSoap\">", wsinfo->qsetname.sget());
-        content.appendf("<operation name=\"%s\">", wsinfo->queryname.sget());
-        content.appendf("<input message=\"tns:%sSoapIn\"/>", wsinfo->queryname.sget());
-        content.appendf("<output message=\"tns:%sSoapOut\"/>", wsinfo->queryname.sget());
+        content.appendf("<portType name=\"%sServiceSoap\">", wsinfo->qsetname.str());
+        content.appendf("<operation name=\"%s\">", wsinfo->queryname.str());
+        content.appendf("<input message=\"tns:%sSoapIn\"/>", wsinfo->queryname.str());
+        content.appendf("<output message=\"tns:%sSoapOut\"/>", wsinfo->queryname.str());
         content.append("</operation>");
         content.append("</portType>");
     }
@@ -2003,11 +2003,11 @@ int CWsEclBinding::getWsdlBindings(IEspContext &context, CHttpRequest *request,
     WsEclWuInfo *wsinfo = (WsEclWuInfo *) context.getBindingValue();
     if (wsinfo)
     {
-        content.appendf("<binding name=\"%sServiceSoap\" type=\"tns:%sServiceSoap\">", wsinfo->qsetname.sget(), wsinfo->qsetname.sget());
+        content.appendf("<binding name=\"%sServiceSoap\" type=\"tns:%sServiceSoap\">", wsinfo->qsetname.str(), wsinfo->qsetname.str());
         content.append("<soap:binding transport=\"http://schemas.xmlsoap.org/soap/http\" style=\"document\"/>");
 
-        content.appendf("<operation name=\"%s\">", wsinfo->queryname.sget());
-        content.appendf("<soap:operation soapAction=\"/%s/%s?ver_=1.0\" style=\"document\"/>", wsinfo->qsetname.sget(), wsinfo->queryname.sget());
+        content.appendf("<operation name=\"%s\">", wsinfo->queryname.str());
+        content.appendf("<soap:operation soapAction=\"/%s/%s?ver_=1.0\" style=\"document\"/>", wsinfo->qsetname.str(), wsinfo->queryname.str());
         content.append("<input>");
         content.append("<soap:body use=\"literal\"/>");
         content.append("</input>");
@@ -2023,7 +2023,7 @@ int CWsEclBinding::getWsdlBindings(IEspContext &context, CHttpRequest *request,
 int CWsEclBinding::onGetWsdl(IEspContext &context, CHttpRequest* request, CHttpResponse* response, WsEclWuInfo &wsinfo)
 {
     context.setBindingValue(&wsinfo);
-    EspHttpBinding::onGetWsdl(context, request, response, wsinfo.qsetname.sget(), wsinfo.queryname.sget());
+    EspHttpBinding::onGetWsdl(context, request, response, wsinfo.qsetname.str(), wsinfo.queryname.str());
     context.setBindingValue(NULL);
     return 0;
 }
@@ -2031,7 +2031,7 @@ int CWsEclBinding::onGetWsdl(IEspContext &context, CHttpRequest* request, CHttpR
 int CWsEclBinding::onGetXsd(IEspContext &context, CHttpRequest* request, CHttpResponse* response, WsEclWuInfo &wsinfo)
 {
     context.setBindingValue(&wsinfo);
-    EspHttpBinding::onGetXsd(context, request, response, wsinfo.qsetname.sget(), wsinfo.queryname.sget());
+    EspHttpBinding::onGetXsd(context, request, response, wsinfo.qsetname.str(), wsinfo.queryname.str());
     context.setBindingValue(NULL);
 
     return 0;

esp/services/ws_ecl/ws_ecl_wuinfo.cpp

@@ -37,11 +37,11 @@ IConstWorkUnit *WsEclWuInfo::ensureWorkUnit()
     if (wu)
         return wu;
     Owned<IWorkUnitFactory> wf = getWorkUnitFactory();
-    wu.setown(wf->openWorkUnit(wuid.sget(), false));
+    wu.setown(wf->openWorkUnit(wuid.str(), false));
     if (!wu)
-        throw MakeStringException(-1, "Could not open workunit: %s", wuid.sget());
+        throw MakeStringException(-1, "Could not open workunit: %s", wuid.str());
     if (isLibrary(wu))
-        throw MakeStringException(-1, "%s/%s %s is a library", qsetname.sget(), queryname.sget(), wuid.sget());
+        throw MakeStringException(-1, "%s/%s %s is a library", qsetname.str(), queryname.str(), wuid.str());
     return wu;
 }
 
@@ -49,7 +49,7 @@ bool WsEclWuInfo::getWsResource(const char *name, StringBuffer &out)
 {
     if (strieq(name, "SOAP"))
     {
-        out.appendf("<message name=\"%s\">", queryname.sget());
+        out.appendf("<message name=\"%s\">", queryname.str());
         IConstWUResultIterator &vars = ensureWorkUnit()->getVariables();
         Owned<IResultSetFactory> resultSetFactory(getResultSetFactory(username, password));
         ForEach(vars)
@@ -110,7 +110,7 @@ bool WsEclWuInfo::getWsResource(const char *name, StringBuffer &out)
                     ptype.set("xsd:string");
                     break;
                 }
-                out.appendf("<part name=\"%s\" type=\"%s\" />", varname.str(), ptype.sget());
+                out.appendf("<part name=\"%s\" type=\"%s\" />", varname.str(), ptype.str());
             }
         }
         out.append("</message>");

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -2063,7 +2063,7 @@ public:
 
         destQuerySet.setown(getQueryRegistry(target, false));
         if (!destQuerySet) // getQueryRegistry should have created if not found
-            throw MakeStringException(ECLWATCH_QUERYSET_NOT_FOUND, "Destination Queryset %s could not be created, or found", target.sget());
+            throw MakeStringException(ECLWATCH_QUERYSET_NOT_FOUND, "Destination Queryset %s could not be created, or found", target.str());
 
         factory.setown(getWorkUnitFactory(context->querySecManager(), context->queryUser()));
     }

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -1050,7 +1050,7 @@ bool CWsWorkunitsEx::onWUSubmit(IEspContext &context, IEspWUSubmitRequest &req,
                 throw WsWuHelpers::noteException(wu, MakeStringException(ECLWATCH_INVALID_INPUT,"Queryset and/or query not specified"));
             }
 
-            WsWuHelpers::runWsWuQuery(context, cw, info.queryset.sget(), info.query.sget(), cluster, NULL);
+            WsWuHelpers::runWsWuQuery(context, cw, info.queryset.str(), info.query.str(), cluster, NULL);
         }
         else
             WsWuHelpers::submitWsWorkunit(context, cw, cluster, req.getSnapshot(), req.getMaxRunTime(), true, false, false);

roxie/ccd/ccdcontext.cpp

@@ -3575,7 +3575,7 @@ public:
         else
         {
             // predeployed queries with no workunit should return the querySet name
-            return strdup(querySetName.sget()); // sget will return "" rather than NULL
+            return strdup(querySetName.str()); // sget will return "" rather than NULL
         }
     }
     virtual char *getGroupName() { throwUnexpected(); }
@@ -3750,7 +3750,7 @@ public:
         StringBuffer responseHead, responseTail;
         responseHead.append("<").append(queryName).append("Response");
         responseHead.append(" sequence=\"").append(seqNo).append("\"");
-        responseHead.append(" xmlns=\"urn:hpccsystems:ecl:").appendLower(queryName.length(), queryName.sget()).append("\">");
+        responseHead.append(" xmlns=\"urn:hpccsystems:ecl:").appendLower(queryName.length(), queryName.str()).append("\">");
         responseHead.append("<Results><Result>");
         unsigned len = responseHead.length();
         client->write(responseHead.detach(), len, true);

roxie/ccd/ccdfile.cpp

@@ -1491,7 +1491,7 @@ public:
     {
         FilePartMapElement *part = (FilePartMapElement *) bsearch(&pos, map, numParts, sizeof(map[0]), compareParts);
         if (!part)
-            throw MakeStringException(ROXIE_DATA_ERROR, "CFilePartMap: file position %"I64F"d in file %s out of range (max offset permitted is %"I64F"d)", pos, fileName.sget(), totalSize);
+            throw MakeStringException(ROXIE_DATA_ERROR, "CFilePartMap: file position %"I64F"d in file %s out of range (max offset permitted is %"I64F"d)", pos, fileName.str(), totalSize);
         return (part-map)+1;
     }
     virtual unsigned getNumParts() const

system/jlib/jstring.hpp

@@ -252,11 +252,10 @@ public:
     inline operator const char * () const       { return text; }
     inline void clear()                         { setown(NULL); }
     inline char * detach()                      { char * ret = text; text = NULL; return ret; }
-    inline const char * get(void) const         { return text; }
+    inline const char * get() const         { return text; }
     inline size32_t     length() const          { return text ? (size32_t)strlen(text) : 0; }
     inline bool isEmpty() const                 { return !text||!*text; } // faster than (length==0)
-    inline const char * str(void) const         { return text ? text : ""; } // safe form (doesn't return NULL)
-    inline const char * sget(void) const        { return text ? text : ""; } // safe form of get (doesn't return NULL)
+    inline const char * str() const         { return text ? text : ""; } // safe form (doesn't return NULL)
 
     void         set(const char * _text);
     void         setown(const char * _text);

system/jlib/jutil.cpp

@@ -2604,7 +2604,7 @@ const char * queryCurrentProcessPath()
     }
     if (processPath.isEmpty())
         return NULL;
-    return processPath.sget();
+    return processPath.str();
 }
 
 inline bool isOctChar(char c) 

system/security/securesocket/securesocket.cpp

@@ -869,7 +869,7 @@ public:
             throw MakeStringException(-1, "ctx can't be created");
         }
         password.set(passphrase);
-        SSL_CTX_set_default_passwd_cb_userdata(m_ctx, (void*)password.sget());
+        SSL_CTX_set_default_passwd_cb_userdata(m_ctx, (void*)password.str());
         SSL_CTX_set_default_passwd_cb(m_ctx, pem_passwd_cb);
 
         if(SSL_CTX_use_certificate_file(m_ctx, certfile, SSL_FILETYPE_PEM) <= 0)
@@ -919,7 +919,7 @@ public:
             StringBuffer pwd;
             decrypt(pwd, passphrase);
             password.set(pwd);
-            SSL_CTX_set_default_passwd_cb_userdata(m_ctx, (void*)password.sget());
+            SSL_CTX_set_default_passwd_cb_userdata(m_ctx, (void*)password.str());
             SSL_CTX_set_default_passwd_cb(m_ctx, pem_passwd_cb);
         }
 

system/xmllib/libxslt_processor.cpp

@@ -529,7 +529,7 @@ int CLibXslTransform::transform(xmlChar **xmlbuff, int &len)
         IXslFunction *fn = functions.mapToValue(&h.query());
         CLibXslFunction *cfn = dynamic_cast<CLibXslFunction*>(fn);
         if (cfn && cfn->name.length())
-            xsltRegisterExtFunction(ctxt, (const xmlChar *) cfn->name.get(), (const xmlChar *) cfn->uri.sget(), globalLibXsltExtensionHandler);
+            xsltRegisterExtFunction(ctxt, (const xmlChar *) cfn->name.get(), (const xmlChar *) cfn->uri.str(), globalLibXsltExtensionHandler);
     }
     xsltSetCtxtParseOptions(ctxt, XSLT_PARSE_OPTIONS);
     MemoryBuffer mp;

system/xmllib/xslcache.cpp

@@ -154,7 +154,7 @@ public:
             return false;
         if (!m_cacheId.length())
             return false;
-        return (entry->m_cacheId.length()) && (streq(m_cacheId.sget(), entry->m_cacheId.sget()));
+        return (entry->m_cacheId.length()) && (streq(m_cacheId.str(), entry->m_cacheId.str()));
     }
 
     bool equal(CXslEntry* entry, bool matched)

tools/esdlcmd/esdlcmd_common.cpp

@@ -64,7 +64,7 @@ esdlCmdOptionMatchIndicator EsdlCmdCommon::matchCommandLineOption(ArgvIterator &
     if (iter.matchOption(tempArg, "-brk"))
     {
 #if defined(_WIN32) && defined(_DEBUG)
-        unsigned id = atoi(tempArg.sget());
+        unsigned id = atoi(tempArg.str());
         if (id == 0)
             DebugBreak();
         else

tools/esdlcmd/esdlcmd_shell.cpp

@@ -37,7 +37,7 @@ int EsdlCMDShell::callExternal(ArgvIterator &iter)
 {
     const char *argv[100];
     StringBuffer cmdstr("esdl-");
-    cmdstr.append(cmd.sget());
+    cmdstr.append(cmd.str());
     int i=0;
     argv[i++]=cmdstr.str();
     if (optHelp)
@@ -55,11 +55,11 @@ int EsdlCMDShell::callExternal(ArgvIterator &iter)
         switch(errno)
         {
         case ENOENT:
-            fprintf(stderr, "esdl '%s' command not found\n", cmd.sget());
+            fprintf(stderr, "esdl '%s' command not found\n", cmd.str());
             usage();
             return 1;
         default:
-            fprintf(stderr, "esdl '%s' command error %d\n", cmd.sget(), errno);
+            fprintf(stderr, "esdl '%s' command error %d\n", cmd.str(), errno);
             return 1;
         }
     }
@@ -75,7 +75,7 @@ int EsdlCMDShell::processCMD(ArgvIterator &iter)
         {
             if (runExternals)
                 return callExternal(iter);
-            fprintf(stderr, "esdl '%s' command not found\n", cmd.sget());
+            fprintf(stderr, "esdl '%s' command not found\n", cmd.str());
         }
         usage();
         return 1;
@@ -157,7 +157,7 @@ bool EsdlCMDShell::parseCommandLineOptions(ArgvIterator &iter)
         if (iter.matchOption(tempArg, "-brk"))
         {
 #if defined(_WIN32) && defined(_DEBUG)
-            unsigned id = atoi(tempArg.sget());
+            unsigned id = atoi(tempArg.str());
             if (id == 0)
                 DebugBreak();
             else