Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord

Browse source
This commit is contained in:
kervala 2015-12-15 13:39:40 +01:00
parent 076af98123
commit a09a5be6d1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/server/src/general_utilities_service/merge_commands.cpp
View file

@ -62,7 +62,7 @@ NLMISC_CATEGORISED_COMMAND(ShardMerge,mergeGuildIdFix,"set the guild ids in the
// read the file // read the file
static CPersistentDataRecord pdr; static CPersistentDataRecord pdr;
pdr.clear(); pdr.clear();
pdr.readFromFile(fdc[i].FileName.c_str()); pdr.readFromFile(fdc[i].FileName);
// convert to XML // convert to XML
NLMISC::CSString inputString; NLMISC::CSString inputString;
@ -80,8 +80,8 @@ NLMISC_CATEGORISED_COMMAND(ShardMerge,mergeGuildIdFix,"set the guild ids in the
pdr.fromXML(resultString); pdr.fromXML(resultString);
// write the file // write the file
pdr.writeToFile((fdc[i].FileName+".new.xml").c_str()); pdr.writeToFile(fdc[i].FileName+".new.xml");
pdr.writeToFile((fdc[i].FileName+".new.bin").c_str()); pdr.writeToFile(fdc[i].FileName+".new.bin");
} }
return true; return true;
@ -109,7 +109,7 @@ NLMISC_CATEGORISED_COMMAND(ShardMerge,mergeChangeCharacterNames,"change names of
DROP_IF(!NLMISC::CFile::fileExists(fileName),"Skipping inexistant file: "+fileName,continue); DROP_IF(!NLMISC::CFile::fileExists(fileName),"Skipping inexistant file: "+fileName,continue);
static CPersistentDataRecord pdr; static CPersistentDataRecord pdr;
pdr.clear(); pdr.clear();
pdr.readFromFile(fileName.c_str()); pdr.readFromFile(fileName);
// convert to XML // convert to XML
NLMISC::CSString inputString; NLMISC::CSString inputString;
@ -127,8 +127,8 @@ NLMISC_CATEGORISED_COMMAND(ShardMerge,mergeChangeCharacterNames,"change names of
pdr.fromXML(resultString); pdr.fromXML(resultString);
// write the file // write the file
pdr.writeToFile((fileName+".new.xml").c_str()); pdr.writeToFile(fileName+".new.xml");
pdr.writeToFile((fileName+".new.bin").c_str()); pdr.writeToFile(fileName+".new.bin");
} }
return true; return true;