Skip to content

Commit

Permalink
HPCC-12622 Deprecate toCharArray()
Browse files Browse the repository at this point in the history 
Signed-off-by: jamienoss <james.noss@lexisnexis.com>
  • Loading branch information
@jamienoss
jamienoss committed Nov 26, 2014
1 parent 5f4a968 commit dea9dec
Show file tree
Hide file tree
Showing 67 changed files with 210 additions and 211 deletions.
36 changes: 18 additions & 18 deletions common/deftype/defvalue.cpp
View file
Expand Up @@ -250,13 +250,13 @@ VarStringValue::VarStringValue(unsigned len, const char *v, ITypeInfo *_type) :

const char *VarStringValue::generateECL(StringBuffer &out)
{
return appendStringAsQuotedECL(out, val.length(), val).toCharArray();
return appendStringAsQuotedECL(out, val.length(), val).str();
}

const char *VarStringValue::generateCPP(StringBuffer &out, CompilerType compiler)
{
unsigned len = val.length();
return appendStringAsQuotedCPP(out, len, val.get(), len>120).toCharArray();
return appendStringAsQuotedCPP(out, len, val.get(), len>120).str();
}

void VarStringValue::toMem(void *target)
Expand Down Expand Up @@ -324,7 +324,7 @@ __int64 VarStringValue::getIntValue()
const char *VarStringValue::getStringValue(StringBuffer &out)
{
out.append(val);
return out.toCharArray();
return out.str();
}

void VarStringValue::pushDecimalValue(void)
Expand Down Expand Up @@ -469,7 +469,7 @@ StringValue::StringValue(const char *v, ITypeInfo *_type) : MemoryValue(_type)

const char *StringValue::generateECL(StringBuffer &out)
{
return appendStringAsQuotedECL(out, type->getSize(), (const char *)val.get()).toCharArray();
return appendStringAsQuotedECL(out, type->getSize(), (const char *)val.get()).str();
}

int StringValue::compare(IValue * to)
Expand Down Expand Up @@ -541,7 +541,7 @@ __int64 StringValue::getIntValue()
const char *StringValue::getStringValue(StringBuffer &out)
{
out.append(type->getSize(), (const char *)val.get());
return out.toCharArray();
return out.str();
}

const char *StringValue::getUTF8Value(StringBuffer &out)
Expand All @@ -559,7 +559,7 @@ const char *StringValue::getUTF8Value(StringBuffer &out)
unsigned bufflen;
rtlStrToUtf8X(bufflen, temp.refstr(), type->getSize(), (const char *)val.get());
out.append(rtlUtf8Size(bufflen, temp.getstr()), temp.getstr());
return out.toCharArray();
return out.str();
}

void StringValue::pushDecimalValue()
Expand Down Expand Up @@ -869,7 +869,7 @@ const char * VarUnicodeValue::generateCPP(StringBuffer & out, CompilerType compi
{
out.append("(UChar *)");
unsigned len = val.length()*2+1; // not pretty, but adds one null, so that string is double-null-terminated as required
return appendStringAsQuotedCPP(out, len, (char const *)val.get(), len>120).toCharArray();
return appendStringAsQuotedCPP(out, len, (char const *)val.get(), len>120).str();
}

const char * VarUnicodeValue::generateECL(StringBuffer & out)
Expand Down Expand Up @@ -1232,7 +1232,7 @@ const char *DataValue::generateECL(StringBuffer &out)
out.append("X'");
appendDataAsHex(out, val.length(), val.get());
out.append('\'');
return out.toCharArray();
return out.str();
}


Expand Down Expand Up @@ -1321,7 +1321,7 @@ bool DataValue::getBoolValue()
const char *DataValue::getStringValue(StringBuffer &out)
{
appendDataAsHex(out, val.length(), val.get());
return out.toCharArray();
return out.str();
}

IValue *createDataValue(const char *val, unsigned size)
Expand Down Expand Up @@ -1435,7 +1435,7 @@ const char *QStringValue::getStringValue(StringBuffer &out)
rtlQStrToStr(strLen, strData, strLen, (const char *)val.get());
out.append(strLen, strData);
free(strData);
return out.toCharArray();
return out.str();
}

void QStringValue::pushDecimalValue()
Expand Down Expand Up @@ -1486,7 +1486,7 @@ const char *CharValue::generateCPP(StringBuffer &out, CompilerType compiler)
out.append((int)val);
break;
}
return out.toCharArray();
return out.str();
}

void CharValue::toMem(void *target)
Expand Down Expand Up @@ -1538,7 +1538,7 @@ bool CharValue::getBoolValue()

const char *CharValue::getStringValue(StringBuffer &out)
{
return out.append(val).toCharArray();
return out.append(val).str();
}

void CharValue::pushDecimalValue()
Expand Down Expand Up @@ -1728,7 +1728,7 @@ const char *IntValue::getStringValue(StringBuffer &s)
s.append((__int64)val);
else
s.append(val);
return s.toCharArray();
return s.str();
}

bool IntValue::getBoolValue()
Expand Down Expand Up @@ -2173,7 +2173,7 @@ const char *DecimalValue::generateCPP(StringBuffer &s, CompilerType compiler)
s.appendhex(c, false);
}
s.append('"');
return s.toCharArray();
return s.str();
}

const char *DecimalValue::getStringValue(StringBuffer &s)
Expand All @@ -2183,7 +2183,7 @@ const char *DecimalValue::getStringValue(StringBuffer &s)
pushDecimalValue();
DecPopCString(sizeof(strval), strval);
s.append(strval);
return s.toCharArray();
return s.str();
}

bool DecimalValue::getBoolValue()
Expand Down Expand Up @@ -2254,19 +2254,19 @@ IValue *createDecimalValueFromStack(ITypeInfo * type)
const char *BoolValue::generateECL(StringBuffer &s)
{
s.append(val ? "true" : "false");
return s.toCharArray();
return s.str();
}

const char *BoolValue::generateCPP(StringBuffer &s, CompilerType compiler)
{
s.append(val ? "true" : "false");
return s.toCharArray();
return s.str();
}

const char *BoolValue::getStringValue(StringBuffer &s)
{
s.append(val ? "true" : "false");
return s.toCharArray();
return s.str();
}

bool BoolValue::getBoolValue()
Expand Down
4 changes: 2 additions & 2 deletions common/fileview2/fvtransform.cpp
View file
Expand Up @@ -351,11 +351,11 @@ void * ViewTransformerRegistry::resolveExternal(IHqlExpression * funcdef)

ensureFileExtension(lib, SharedObjectExtension);

Owned<ILoadedDllEntry> match = loadedPlugins->getPluginDll(lib.toCharArray(), NULL, false); // MORE - shouldn't it check the version????
Owned<ILoadedDllEntry> match = loadedPlugins->getPluginDll(lib.str(), NULL, false); // MORE - shouldn't it check the version????
if (!match)
return NULL;

return GetSharedProcedure(match->getInstance(), entry.toCharArray());
return GetSharedProcedure(match->getInstance(), entry.str());
}


Expand Down
4 changes: 2 additions & 2 deletions dali/base/dacoven.cpp
View file
Expand Up @@ -495,13 +495,13 @@ class CCovenServer: public CCovenBase
toXML(t, xml);
Owned<IFile> f = createIFile(storename.get());
Owned<IFileIO> io = f->open(IFOcreate);
io->write(0, xml.length(), xml.toCharArray());
io->write(0, xml.length(), xml.str());
io.clear();
if (!backupname.isEmpty()) {
try {
f.setown(createIFile(backupname.get()));
io.setown(f->open(IFOcreate));
io->write(0, xml.length(), xml.toCharArray());
io->write(0, xml.length(), xml.str());
io.clear();
}
catch (IException *e) {
Expand Down
24 changes: 12 additions & 12 deletions dali/base/dasds.cpp
View file
Expand Up @@ -979,11 +979,11 @@ void writeDelta(StringBuffer &xml, IFile &iFile, const char *msg="", unsigned re
lastGood = iFileIO->size();
}
stream->seek(0, IFSend);
stream->write(xml.length(), xml.toCharArray());
stream->write(xml.length(), xml.str());
stream->flush();
stream.clear();
offset_t fLen = lastGood + xml.length();
unsigned crc = crc32(xml.toCharArray(), xml.length(), startCrc);
unsigned crc = crc32(xml.str(), xml.length(), startCrc);
char *headerPtr = (char *)header.bufferBase();
sprintf(strNum, "%010u", ~crc);
memcpy(headerPtr + deltaHeaderCrcOff, strNum, 10);
Expand Down Expand Up @@ -1432,7 +1432,7 @@ class CLegacyBinaryFileExternal : public CExternalFile, implements IExternalHand
LOG(MCoperatorWarning, unknownJob, e, s.str());
StringBuffer str("EXTERNAL BINARY FILE: \"");
str.append(filename.str()).append("\" MISSING");
CPTValue v(str.length()+1, str.toCharArray(), false);
CPTValue v(str.length()+1, str.str(), false);
v.serialize(mb);
}
else
Expand Down Expand Up @@ -1469,7 +1469,7 @@ class CLegacyBinaryFileExternal : public CExternalFile, implements IExternalHand
{
StringBuffer str("EXTERNAL BINARY FILE: \"");
str.append(filename.str()).append("\" MISSING");
CPTValue v(str.length()+1, str.toCharArray(), false);
CPTValue v(str.length()+1, str.str(), false);
v.serialize(mb);
}
else
Expand Down Expand Up @@ -1537,7 +1537,7 @@ class CBinaryFileExternal : public CExternalFile, implements IExternalHandler
LOG(MCoperatorWarning, unknownJob, e, s.str());
StringBuffer str("EXTERNAL BINARY FILE: \"");
str.append(filename.str()).append("\" MISSING");
CPTValue v(str.length()+1, str.toCharArray(), false);
CPTValue v(str.length()+1, str.str(), false);
v.serialize(mb);
}
else
Expand Down Expand Up @@ -1570,7 +1570,7 @@ class CBinaryFileExternal : public CExternalFile, implements IExternalHandler
{
StringBuffer str("EXTERNAL BINARY FILE: \"");
str.append(filename.str()).append("\" MISSING");
CPTValue v(str.length()+1, str.toCharArray(), false);
CPTValue v(str.length()+1, str.str(), false);
v.serialize(mb);
}
else
Expand Down Expand Up @@ -1637,7 +1637,7 @@ class CXMLFileExternal : public CExternalFile, implements IExternalHandler
LOG(MCoperatorWarning, unknownJob, e, s.str());
StringBuffer str("EXTERNAL XML FILE: \"");
str.append(filename.str()).append("\" MISSING");
CPTValue v(str.length()+1, str.toCharArray(), false);
CPTValue v(str.length()+1, str.str(), false);
v.serialize(mb);
}
else
Expand Down Expand Up @@ -1669,7 +1669,7 @@ class CXMLFileExternal : public CExternalFile, implements IExternalHandler
str.append(filename.str()).append("\" MISSING");
tree.setown(createPTree(owner.queryName()));
if (withValue)
tree->setProp(NULL, str.toCharArray());
tree->setProp(NULL, str.str());
}
else
{
Expand Down Expand Up @@ -3805,7 +3805,7 @@ int CSDSTransactionServer::run()
SDSManager->getLocks(out);
mb.clear().append(DAMP_SDSREPLY_OK);
mb.append(out.length());
mb.append(out.length(), out.toCharArray());
mb.append(out.length(), out.str());

break;
}
Expand Down Expand Up @@ -5285,9 +5285,9 @@ class CStoreHelper : public CInterface, implements IStoreHelper
di->getName(fname);
if ('_' != fname.charAt(7)) // Unhelpful naming convention to differentiate store files from externals!
{
if (0 == memicmp("inc", fname.toCharArray()+4, 3) || 0 == memicmp("sds", fname.toCharArray()+4, 3))
if (0 == memicmp("inc", fname.str()+4, 3) || 0 == memicmp("sds", fname.str()+4, 3))
{
const char *num = fname.toCharArray()+7;
const char *num = fname.str()+7;
const char *dot = (const char *)strchr(num, '.');
unsigned fileEdition = atoi_l(num, dot-num);
int d = (int)fileEdition-(int)edition;
Expand Down Expand Up @@ -7115,7 +7115,7 @@ CServerConnection *CCovenSDSManager::createConnectionInstance(CRemoteTreeBase *r
if (l && '/' == _xpath[l-1])
{
tXpath.append(l-1, _xpath);
_xpath = tXpath.toCharArray();
_xpath = tXpath.str();
}
}
bool newNode = false;
Expand Down
4 changes: 2 additions & 2 deletions dali/daliadmin/daliadmin.cpp
View file
Expand Up @@ -2078,7 +2078,7 @@ struct CTreeItem : public CInterface
{
if (parent)
parent->getXPath(xpath);
xpath.append('/').append(tail->toCharArray());
xpath.append('/').append(tail->str());
if ((index!=0)||tail->IsShared())
xpath.append('[').append(index+1).append(']');
}
Expand Down Expand Up @@ -2131,7 +2131,7 @@ class CXMLSizesParser : public CInterface
virtual void beginNode(const char *tag, offset_t startOffset)
{
String *tail = levtail;
if (levtail&&(0 == strcmp(tag, levtail->toCharArray())))
if (levtail&&(0 == strcmp(tag, levtail->str())))
tail->Link();
else
tail = new String(tag);
Expand Down
6 changes: 3 additions & 3 deletions dali/dfuXRefLib/XRefFilesNode.cpp
View file
Expand Up @@ -71,7 +71,7 @@ void CXRefFilesNode::Deserialize(IPropertyTree& inTree)
CleanTree(inTree);
StringBuffer datastr;
toXML(&inTree,datastr);
m_baseTree.setPropBin("data",datastr.length(),(void*)datastr.toCharArray());
m_baseTree.setPropBin("data",datastr.length(),(void*)datastr.str());
}

IPropertyTree* CXRefFilesNode::FindNode(const char* NodeName)
Expand Down Expand Up @@ -312,7 +312,7 @@ bool CXRefFilesNode::AttachPhysical(const char *Partmask,IUserDescriptor* udesc,
return false;
}

if (queryDistributedFileDirectory().exists(logicalName.toCharArray(),udesc))
if (queryDistributedFileDirectory().exists(logicalName.str(),udesc))
{
ERRLOG("Logical File %s already Exists. Can not reattach to Dali",logicalName.str());
errstr.appendf("Logical File %s already Exists. Can not reattach to Dali",logicalName.str());
Expand Down Expand Up @@ -364,7 +364,7 @@ bool CXRefFilesNode::AttachPhysical(const char *Partmask,IUserDescriptor* udesc,
}

Owned<IDistributedFile> dFile = queryDistributedFileDirectory().createNew(fileDesc);
dFile->attach(logicalName.toCharArray(),udesc);
dFile->attach(logicalName.str(),udesc);

if (!RemoveTreeNode(Partmask)) {
ERRLOG("Removing XRef Branch %s",Partmask);
Expand Down
6 changes: 3 additions & 3 deletions dali/dfuXRefLib/XRefNodeManager.cpp
View file
Expand Up @@ -270,7 +270,7 @@ void CXRefNode::deserializeMessages(IPropertyTree& inTree)
}
StringBuffer datastr;
toXML(&inTree,datastr);
m_messages->setPropBin("data",datastr.length(),(void*)datastr.toCharArray());
m_messages->setPropBin("data",datastr.length(),(void*)datastr.str());
}

StringBuffer &CXRefNode::serializeDirectories(StringBuffer &buf)
Expand Down Expand Up @@ -311,7 +311,7 @@ void CXRefNode::deserializeDirectories(IPropertyTree& inTree)
}
StringBuffer datastr;
toXML(&inTree,datastr);
m_directories->setPropBin("data",datastr.length(),(void*)datastr.toCharArray());
m_directories->setPropBin("data",datastr.length(),(void*)datastr.str());


}
Expand Down Expand Up @@ -465,7 +465,7 @@ bool CXRefNode::removeEmptyDirectories(StringBuffer &errstr)
ForEachItemInRev(i,todelete)
t->removeTree((IPropertyTree *)todelete.item(i)); // probably should check succeeded above but next run will correct
toXML(t,dataStr.clear());
m_directories->setPropBin("data",dataStr.length(),(void*)dataStr.toCharArray());
m_directories->setPropBin("data",dataStr.length(),(void*)dataStr.str());
emptyScopes();
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion dali/dfuplus/dfuplus.cpp
View file
Expand Up @@ -1095,7 +1095,7 @@ int CDfuPlusHelper::list()
StringBuffer output;
output.append(onefile->getName());
output.append("\n");
fputs(output.toCharArray(),f);
fputs(output.str(),f);
}
}
}
Expand Down

0 comments on commit dea9dec

Please sign in to comment.