livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace llifstream and llofstream with std::ifstream and std::ofstream respectively

master
Oz Linden 2015-04-07 17:59:28 -04:00
parent 3a57b18896
commit 8b42c7898e
59 changed files with 124 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llappearance/llwearable.cpp
View File

@ -88,7 +88,7 @@ LLAssetType::EType LLWearable::getAssetType() const
BOOL LLWearable::exportFile(const std::string& filename) const
{
llofstream ofs(filename.c_str(), std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);
std::ofstream ofs(filename.c_str(), std::ios_base::out | std::ios_base::trunc | std::ios_base::binary);
return ofs.is_open() && exportStream(ofs);
}
@ -204,7 +204,7 @@ void LLWearable::createLayers(S32 te, LLAvatarAppearance *avatarp)
LLWearable::EImportResult LLWearable::importFile(const std::string& filename,
LLAvatarAppearance* avatarp )
{
llifstream ifs(filename.c_str(), std::ios_base::in | std::ios_base::binary);
std::ifstream ifs(filename.c_str(), std::ios_base::in | std::ios_base::binary);
return (! ifs.is_open())? FAILURE : importStream(ifs, avatarp);
}

4
indra/llcommon/llerror.cpp
View File

@ -135,7 +135,7 @@ namespace {
}
private:
llofstream mFile;
std::ofstream mFile;
};
@ -335,7 +335,7 @@ namespace
LLSD configuration;
{
llifstream file(filename().c_str());
std::ifstream file(filename().c_str());
if (file.is_open())
{
LLSDSerialize::fromXML(configuration, file);

239
indra/llcommon/llfile.cpp
View File

@ -865,242 +865,3 @@ int llstdio_filebuf::sync()
}
#endif
#if 0 // @TBDeleted
/************** input file stream ********************************/
llifstream::llifstream() : _M_filebuf(),
#if LL_WINDOWS
std::istream(&_M_filebuf) {}
#else
std::istream()
{
this->init(&_M_filebuf);
}
#endif
// explicit
llifstream::llifstream(const std::string& _Filename,
ios_base::openmode _Mode) : _M_filebuf(),
#if LL_WINDOWS
std::istream(&_M_filebuf)
{
llutf16string wideName = utf8str_to_utf16str( _Filename );
if (_M_filebuf.open(wideName.c_str(), _Mode | ios_base::in) == 0)
{
_Myios::setstate(ios_base::failbit);
}
}
#else
std::istream()
{
this->init(&_M_filebuf);
this->open(_Filename.c_str(), _Mode | ios_base::in);
}
#endif
// explicit
llifstream::llifstream(const char* _Filename,
ios_base::openmode _Mode) : _M_filebuf(),
#if LL_WINDOWS
std::istream(&_M_filebuf)
{
llutf16string wideName = utf8str_to_utf16str( _Filename );
if (_M_filebuf.open(wideName.c_str(), _Mode | ios_base::in) == 0)
{
_Myios::setstate(ios_base::failbit);
}
}
#else
std::istream()
{
this->init(&_M_filebuf);
this->open(_Filename, _Mode | ios_base::in);
}
#endif
bool llifstream::is_open() const
{ // test if C stream has been opened
return _M_filebuf.is_open();
}
void llifstream::open(const char* _Filename, ios_base::openmode _Mode)
{ // open a C stream with specified mode
#if LL_WINDOWS
llutf16string wideName = utf8str_to_utf16str( _Filename );
if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::in) == 0)
{
_Myios::setstate(ios_base::failbit);
}
else
{
_Myios::clear();
}
#else
if (_M_filebuf.open(_Filename, _Mode | ios_base::in) == 0)
{
this->setstate(ios_base::failbit);
}
else
{
this->clear();
}
#endif
}
void llifstream::close()
{ // close the C stream
if (_M_filebuf.close() == 0)
{
#if LL_WINDOWS
_Myios::setstate(ios_base::failbit);
#else
this->setstate(ios_base::failbit);
#endif
}
}
/************** output file stream ********************************/
llofstream::llofstream() : _M_filebuf(),
#if LL_WINDOWS
std::ofstream(&_M_filebuf) {}
#else
std::ofstream()
{
this->init(&_M_filebuf);
}
#endif
// explicit
llofstream::llofstream(const std::string& _Filename,
ios_base::openmode _Mode) : _M_filebuf(),
#if LL_WINDOWS
std::ofstream(&_M_filebuf)
{
llutf16string wideName = utf8str_to_utf16str( _Filename );
if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::out) == 0)
{
_Myios::setstate(ios_base::failbit);
}
}
#else
std::ofstream()
{
this->init(&_M_filebuf);
this->open(_Filename.c_str(), _Mode | ios_base::out);
}
#endif
// explicit
llofstream::llofstream(const char* _Filename,
ios_base::openmode _Mode) : _M_filebuf(),
#if LL_WINDOWS
std::ofstream(&_M_filebuf)
{
llutf16string wideName = utf8str_to_utf16str( _Filename );
if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::out) == 0)
{
_Myios::setstate(ios_base::failbit);
}
}
#else
std::ofstream()
{
this->init(&_M_filebuf);
this->open(_Filename, _Mode | ios_base::out);
}
#endif
bool llofstream::is_open() const
{ // test if C stream has been opened
return _M_filebuf.is_open();
}
void llofstream::open(const char* _Filename, ios_base::openmode _Mode)
{ // open a C stream with specified mode
#if LL_WINDOWS
llutf16string wideName = utf8str_to_utf16str( _Filename );
if (_M_filebuf.open( wideName.c_str(), _Mode | ios_base::out) == 0)
{
_Myios::setstate(ios_base::failbit);
}
else
{
_Myios::clear();
}
#else
if (_M_filebuf.open(_Filename, _Mode | ios_base::out) == 0)
{
this->setstate(ios_base::failbit);
}
else
{
this->clear();
}
#endif
}
void llofstream::close()
{ // close the C stream
if (_M_filebuf.close() == 0)
{
#if LL_WINDOWS
_Myios::setstate(ios_base::failbit);
#else
this->setstate(ios_base::failbit);
#endif
}
}
void llofstream::~llofstream()
{
try:
{
if ( is_open() )
{
flush();
}
}
catch (std::exception& e)
{
LL_WARNS() << "llofstream std::exception: " << e.what() << LL_ENDL;
}
catch (...)
{
LL_WARNS() << "llofstream non-std exception" << LL_ENDL;
}
}
/************** helper functions ********************************/
std::streamsize llifstream_size(llifstream& ifstr)
{
if(!ifstr.is_open()) return 0;
std::streampos pos_old = ifstr.tellg();
ifstr.seekg(0, ios_base::beg);
std::streampos pos_beg = ifstr.tellg();
ifstr.seekg(0, ios_base::end);
std::streampos pos_end = ifstr.tellg();
ifstr.seekg(pos_old, ios_base::beg);
return pos_end - pos_beg;
}
std::streamsize llofstream_size(llofstream& ofstr)
{
if(!ofstr.is_open()) return 0;
std::streampos pos_old = ofstr.tellp();
ofstr.seekp(0, ios_base::beg);
std::streampos pos_beg = ofstr.tellp();
ofstr.seekp(0, ios_base::end);
std::streampos pos_end = ofstr.tellp();
ofstr.seekp(pos_old, ios_base::beg);
return pos_end - pos_beg;
}
#endif // @TBDeleted

162
indra/llcommon/llfile.h
View File

@ -192,166 +192,4 @@ protected:
#endif
};
typedef std::ifstream llifstream;
typedef std::ofstream llofstream;
#if 0 /* @TBDeleted */
/**
* @brief Controlling input for files.
*
* This class supports reading from named files, using the inherited
* functions from std::basic_istream. To control the associated
* sequence, an instance of std::basic_filebuf (or a platform-specific derivative)
* which allows construction using a pre-exisintg file stream buffer.
* We refer to this std::basic_filebuf (or derivative) as @c sb.
*/
class LL_COMMON_API llifstream : public std::istream
{
// input stream associated with a C stream
public:
// Constructors:
/**
* @brief Default constructor.
*
* Initializes @c sb using its default constructor, and passes
* @c &sb to the base class initializer. Does not open any files
* (you haven't given it a filename to open).
*/
llifstream();
/**
* @brief Create an input file stream.
* @param Filename String specifying the filename.
* @param Mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::in is automatically included in @a mode.
*/
explicit llifstream(const std::string& _Filename,
ios_base::openmode _Mode = ios_base::in);
explicit llifstream(const char* _Filename,
ios_base::openmode _Mode = ios_base::in);
/**
* @brief The destructor does nothing.
*
* The file is closed by the filebuf object, not the formatting
* stream.
*/
virtual ~llifstream() {}
// Members:
/**
* @brief Wrapper to test for an open file.
* @return @c rdbuf()->is_open()
*/
bool is_open() const;
/**
* @brief Opens an external file.
* @param Filename The name of the file.
* @param Node The open mode flags.
*
* Calls @c llstdio_filebuf::open(s,mode|in). If that function
* fails, @c failbit is set in the stream's error state.
*/
void open(const std::string& _Filename,
ios_base::openmode _Mode = ios_base::in)
{ open(_Filename.c_str(), _Mode); }
void open(const char* _Filename,
ios_base::openmode _Mode = ios_base::in);
/**
* @brief Close the file.
*
* Calls @c llstdio_filebuf::close(). If that function
* fails, @c failbit is set in the stream's error state.
*/
void close();
private:
llstdio_filebuf _M_filebuf;
};
/**
* @brief Controlling output for files.
*
* This class supports writing to named files, using the inherited
* functions from std::basic_ostream. To control the associated
* sequence, an instance of std::basic_filebuf (or a platform-specific derivative)
* which allows construction using a pre-exisintg file stream buffer.
* We refer to this std::basic_filebuf (or derivative) as @c sb.
*/
class LL_COMMON_API llofstream : public std::ofstream
{
public:
// Constructors:
/**
* @brief Default constructor.
*
* Initializes @c sb using its default constructor, and passes
* @c &sb to the base class initializer. Does not open any files
* (you haven't given it a filename to open).
*/
llofstream();
/**
* @brief Create an output file stream.
* @param Filename String specifying the filename.
* @param Mode Open file in specified mode (see std::ios_base).
*
* @c ios_base::out|ios_base::trunc is automatically included in
* @a mode.
*/
explicit llofstream(const std::string& _Filename,
ios_base::openmode _Mode = ios_base::out|ios_base::trunc);
explicit llofstream(const char* _Filename,
ios_base::openmode _Mode = ios_base::out|ios_base::trunc);
/**
* @brief The destructor does nothing.
*
* The file is closed by the filebuf object, not the formatting
* stream.
*/
virtual ~llofstream();
// Members:
/**
* @brief Opens an external file.
* @param Filename The name of the file.
* @param Node The open mode flags.
*
* Calls @c llstdio_filebuf::open(s,mode|out). If that function
* fails, @c failbit is set in the stream's error state.
*/
void open(const std::string& _Filename,
ios_base::openmode _Mode = ios_base::out|ios_base::trunc)
{ open(_Filename.c_str(), _Mode); }
void open(const char* _Filename,
ios_base::openmode _Mode = ios_base::out|ios_base::trunc);
/**
* @brief Close the file.
*
* Calls @c llstdio_filebuf::close(). If that function
* fails, @c failbit is set in the stream's error state.
*/
void close();
private:
llstdio_filebuf _M_filebuf;
};
/**
* @breif filesize helpers.
*
* The file size helpers are not considered particularly efficient,
* and should only be used for config files and the like -- not in a
* loop.
*/
std::streamsize LL_COMMON_API llifstream_size(llifstream& fstr);
std::streamsize LL_COMMON_API llofstream_size(llofstream& fstr);
#endif /* @TBDeleted */
#endif // not LL_LLFILE_H

2
indra/llcommon/llliveappconfig.cpp
View File

@ -49,7 +49,7 @@ bool LLLiveAppConfig::loadFile()
{
LL_INFOS() << "LLLiveAppConfig::loadFile(): reading from "
<< filename() << LL_ENDL;
llifstream file(filename().c_str());
std::ifstream file(filename().c_str());
LLSD config;
if (file.is_open())
{

2
indra/llcommon/llstring.cpp
View File

@ -107,7 +107,7 @@ bool iswindividual(llwchar elem)
bool _read_file_into_string(std::string& str, const std::string& filename)
{
llifstream ifs(filename.c_str(), llifstream::binary);
std::ifstream ifs(filename.c_str(), std::ifstream::binary);
if (!ifs.is_open())
{
LL_INFOS() << "Unable to open file " << filename << LL_ENDL;

4
indra/llcrashlogger/llcrashlock.cpp
View File

@ -106,7 +106,7 @@ LLSD LLCrashLock::getLockFile(std::string filename)
{
LLSD lock_sd = LLSD::emptyMap();
llifstream ifile(filename.c_str());
std::ifstream ifile(filename.c_str());
if (ifile.is_open())
{
@ -120,7 +120,7 @@ LLSD LLCrashLock::getLockFile(std::string filename)
bool LLCrashLock::putLockFile(std::string filename, const LLSD& data)
{
bool result = true;
llofstream ofile(filename.c_str());
std::ofstream ofile(filename.c_str());
if (!LLSDSerialize::toXML(data,ofile))
{

4
indra/llimage/llimage.cpp
View File

@ -1172,7 +1172,7 @@ static std::string find_file(std::string &name, S8 *codec)
for (int i=0; i<(int)(NUM_FILE_EXTENSIONS); i++)
{
tname = name + "." + std::string(file_extensions[i].exten);
llifstream ifs(tname.c_str(), llifstream::binary);
std::ifstream ifs(tname.c_str(), std::ifstream::binary);
if (ifs.is_open())
{
ifs.close();
@ -1219,7 +1219,7 @@ bool LLImageRaw::createFromFile(const std::string &filename, bool j2c_lowest_mip
return false; // format not recognized
}
llifstream ifs(name.c_str(), llifstream::binary);
std::ifstream ifs(name.c_str(), std::ifstream::binary);
if (!ifs.is_open())
{
// SJB: changed from LL_INFOS() to LL_DEBUGS() to reduce spam

2
indra/llimage/llimagefilter.cpp
View File

@ -54,7 +54,7 @@ LLImageFilter::LLImageFilter(const std::string& file_path) :
mStencilMax(1.0)
{
// Load filter description from file
llifstream filter_xml(file_path.c_str());
std::ifstream filter_xml(file_path.c_str());
if (filter_xml.is_open())
{
// Load and parse the file

2
indra/llinventory/llinventory.cpp
View File

@ -229,7 +229,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
}
// exportFile should be replaced with exportLegacyStream
// not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented...
// not sure whether exportLegacyStream(std::ofstream(fp)) would work, fp may need to get icramented...
BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const
{
std::string uuid_str;

2
indra/llmessage/llhttpclient.cpp
View File

@ -157,7 +157,7 @@ namespace
{
LLBufferStream ostream(channels, buffer.get());
llifstream fstream(mFilename.c_str(), std::iostream::binary | std::iostream::out);
std::ifstream fstream(mFilename.c_str(), std::iostream::binary | std::iostream::out);
if(fstream.is_open())
{
fstream.seekg(0, std::ios::end);

2
indra/llmessage/llmessageconfig.cpp
View File

@ -96,7 +96,7 @@ bool LLMessageConfigFile::loadFile()
{
LLSD data;
{
llifstream file(filename().c_str());
std::ifstream file(filename().c_str());
if (file.is_open())
{

2
indra/llmessage/llservicebuilder.cpp
View File

@ -34,7 +34,7 @@
void LLServiceBuilder::loadServiceDefinitionsFromFile(
const std::string& service_filename)
{
llifstream service_file(service_filename.c_str(), std::ios::binary);
std::ifstream service_file(service_filename.c_str(), std::ios::binary);
if(service_file.is_open())
{
LLSD service_data;

4
indra/llrender/llpostprocess.cpp
View File

@ -66,7 +66,7 @@ LLPostProcess::LLPostProcess(void) :
std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
LL_DEBUGS("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
llifstream effectsXML(pathName);
std::ifstream effectsXML(pathName);
if (effectsXML)
{
@ -153,7 +153,7 @@ void LLPostProcess::saveEffect(std::string const & effectName)
std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
//LL_INFOS() << "Saving PostProcess Effects settings to " << pathName << LL_ENDL;
llofstream effectsXML(pathName);
std::ofstream effectsXML(pathName);
LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();

16
indra/llui/llspellcheck.cpp
View File

@ -145,13 +145,13 @@ void LLSpellChecker::refreshDictionaryMap()
// Load dictionary information (file name, friendly name, ...)
std::string user_filename(user_path + DICT_FILE_MAIN);
llifstream user_file(user_filename.c_str(), std::ios::binary);
std::ifstream user_file(user_filename.c_str(), std::ios::binary);
if ( (!user_file.is_open())
|| (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(sDictMap, user_file))
|| (0 == sDictMap.size()) )
{
std::string app_filename(app_path + DICT_FILE_MAIN);
llifstream app_file(app_filename.c_str(), std::ios::binary);
std::ifstream app_file(app_filename.c_str(), std::ios::binary);
if ( (!app_file.is_open())
|| (LLSDParser::PARSE_FAILURE == LLSDSerialize::fromXMLDocument(sDictMap, app_file))
|| (0 == sDictMap.size()) )
@ -161,7 +161,7 @@ void LLSpellChecker::refreshDictionaryMap()
}
// Load user installed dictionary information
llifstream custom_file(user_filename.c_str(), std::ios::binary);
std::ifstream custom_file(user_filename.c_str(), std::ios::binary);
if (custom_file.is_open())
{
LLSD custom_dict_map;
@ -217,7 +217,7 @@ void LLSpellChecker::addToDictFile(const std::string& dict_path, const std::stri
if (gDirUtilp->fileExists(dict_path))
{
llifstream file_in(dict_path.c_str(), std::ios::in);
std::ifstream file_in(dict_path.c_str(), std::ios::in);
if (file_in.is_open())
{
std::string word; int line_num = 0;
@ -240,7 +240,7 @@ void LLSpellChecker::addToDictFile(const std::string& dict_path, const std::stri
word_list.push_back(word);
llofstream file_out(dict_path.c_str(), std::ios::out | std::ios::trunc);
std::ofstream file_out(dict_path.c_str(), std::ios::out | std::ios::trunc);
if (file_out.is_open())
{
file_out << word_list.size() << std::endl;
@ -354,7 +354,7 @@ void LLSpellChecker::initHunspell(const std::string& dict_language)
if (gDirUtilp->fileExists(user_path + DICT_FILE_IGNORE))
{
llifstream file_in((user_path + DICT_FILE_IGNORE).c_str(), std::ios::in);
std::ifstream file_in((user_path + DICT_FILE_IGNORE).c_str(), std::ios::in);
if (file_in.is_open())
{
std::string word; int idxLine = 0;
@ -466,7 +466,7 @@ LLSD LLSpellChecker::loadUserDictionaryMap()
{
LLSD dict_map;
std::string dict_filename(getDictionaryUserPath() + DICT_FILE_USER);
llifstream dict_file(dict_filename.c_str(), std::ios::binary);
std::ifstream dict_file(dict_filename.c_str(), std::ios::binary);
if (dict_file.is_open())
{
LLSDSerialize::fromXMLDocument(dict_map, dict_file);
@ -478,7 +478,7 @@ LLSD LLSpellChecker::loadUserDictionaryMap()
// static
void LLSpellChecker::saveUserDictionaryMap(const LLSD& dict_map)
{
llofstream dict_file((getDictionaryUserPath() + DICT_FILE_USER).c_str(), std::ios::trunc);
std::ofstream dict_file((getDictionaryUserPath() + DICT_FILE_USER).c_str(), std::ios::trunc);
if (dict_file.is_open())
{
LLSDSerialize::toPrettyXML(dict_map, dict_file);

4
indra/llui/lltextparser.cpp
View File

@ -211,7 +211,7 @@ void LLTextParser::loadKeywords()
std::string filename=getFileName();
if (!filename.empty())
{
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -231,7 +231,7 @@ bool LLTextParser::saveToDisk(LLSD highlights)
LL_WARNS() << "LLTextParser::saveToDisk() no valid user directory." << LL_ENDL;
return FALSE;
}
llofstream file;
std::ofstream file;
file.open(filename.c_str());
LLSDSerialize::toPrettyXML(mHighlights, file);
file.close();

2
indra/llui/llviewereventrecorder.h
View File

@ -79,7 +79,7 @@ class LLViewerEventRecorder : public LLSingleton<LLViewerEventRecorder>
bool logEvents;
std::string mLogFilename;
llofstream mLog;
std::ofstream mLog;
private:

6
indra/llvfs/llpidlock.cpp
View File

@ -95,7 +95,7 @@ LLPidLockFile& LLPidLockFile::instance()
void LLPidLockFile::writeLockFile(LLSD pids)
{
llofstream ofile(mLockName.c_str());
std::ofstream ofile(mLockName.c_str());
if (!LLSDSerialize::toXML(pids,ofile))
{
@ -119,7 +119,7 @@ bool LLPidLockFile::requestLock(LLNameTable<void *> *name_table, bool autosave,
LLSD out_pids;
out_pids.append( (LLSD::Integer)mPID );
llifstream ifile(mLockName.c_str());
std::ifstream ifile(mLockName.c_str());
if (ifile.is_open())
{ //If file exists, we need to decide whether or not to continue.
@ -175,7 +175,7 @@ bool LLPidLockFile::checkLock()
void LLPidLockFile::releaseLock()
{
llifstream ifile(mLockName.c_str());
std::ifstream ifile(mLockName.c_str());
LLSD in_pids;
LLSD out_pids;
bool write_file=FALSE;

4
indra/llxml/llcontrol.cpp
View File

@ -832,7 +832,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
++num_saved;
}
}
llofstream file;
std::ofstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -852,7 +852,7 @@ U32 LLControlGroup::saveToFile(const std::string& filename, BOOL nondefault_only
U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_values, bool save_values)
{
LLSD settings;
llifstream infile;
std::ifstream infile;
infile.open(filename.c_str());
if(!infile.is_open())
{

2
indra/llxml/tests/llcontrol_test.cpp
View File

@ -80,7 +80,7 @@ namespace tut
}
void writeSettingsFile(const LLSD& config)
{
llofstream file(mTestConfigFile.c_str());
std::ofstream file(mTestConfigFile.c_str());
if (file.is_open())
{
LLSDSerialize::toPrettyXML(config, file);

8
indra/newview/llagentpilot.cpp
View File

@ -84,7 +84,7 @@ void LLAgentPilot::loadTxt(const std::string& filename)
return;
}
llifstream file(filename.c_str());
std::ifstream file(filename.c_str());
if (!file)
{
@ -125,7 +125,7 @@ void LLAgentPilot::loadXML(const std::string& filename)
return;
}
llifstream file(filename.c_str());
std::ifstream file(filename.c_str());
if (!file)
{
@ -167,7 +167,7 @@ void LLAgentPilot::save()
void LLAgentPilot::saveTxt(const std::string& filename)
{
llofstream file;
std::ofstream file;
file.open(filename.c_str());
if (!file)
@ -190,7 +190,7 @@ void LLAgentPilot::saveTxt(const std::string& filename)
void LLAgentPilot::saveXML(const std::string& filename)
{
llofstream file;
std::ofstream file;
file.open(filename.c_str());
if (!file)

12
indra/newview/llappviewer.cpp
View File

@ -3273,7 +3273,7 @@ void LLAppViewer::writeDebugInfo(bool isStatic)
: getDynamicDebugFile() );
LL_INFOS() << "Opening debug file " << *debug_filename << LL_ENDL;
llofstream out_file(debug_filename->c_str());
std::ofstream out_file(debug_filename->c_str());
isStatic ? LLSDSerialize::toPrettyXML(gDebugInfo, out_file)
: LLSDSerialize::toPrettyXML(gDebugInfo["Dynamic"], out_file);
@ -3762,7 +3762,7 @@ void LLAppViewer::handleViewerCrash()
{
std::string filename;
filename = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "stats.log");
llofstream file(filename.c_str(), std::ios_base::binary);
std::ofstream file(filename.c_str(), std::ios_base::binary);
if(file.good())
{
LL_INFOS() << "Handle viewer crash generating stats log." << LL_ENDL;
@ -4650,7 +4650,7 @@ void LLAppViewer::loadNameCache()
std::string filename =
gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "avatar_name_cache.xml");
LL_INFOS("AvNameCache") << filename << LL_ENDL;
llifstream name_cache_stream(filename.c_str());
std::ifstream name_cache_stream(filename.c_str());
if(name_cache_stream.is_open())
{
if ( ! LLAvatarNameCache::importFile(name_cache_stream))
@ -4665,7 +4665,7 @@ void LLAppViewer::loadNameCache()
std::string name_cache;
name_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "name.cache");
llifstream cache_file(name_cache.c_str());
std::ifstream cache_file(name_cache.c_str());
if(cache_file.is_open())
{
if(gCacheName->importFile(cache_file)) return;
@ -4677,7 +4677,7 @@ void LLAppViewer::saveNameCache()
// display names cache
std::string filename =
gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "avatar_name_cache.xml");
llofstream name_cache_stream(filename.c_str());
std::ofstream name_cache_stream(filename.c_str());
if(name_cache_stream.is_open())
{
LLAvatarNameCache::exportFile(name_cache_stream);
@ -4688,7 +4688,7 @@ void LLAppViewer::saveNameCache()
{
std::string name_cache;
name_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "name.cache");
llofstream cache_file(name_cache.c_str());
std::ofstream cache_file(name_cache.c_str());
if(cache_file.is_open())
{
gCacheName->exportFile(cache_file);

6
indra/newview/llautoreplace.cpp
View File

@ -148,7 +148,7 @@ void LLAutoReplace::loadFromSettings()
if(gDirUtilp->fileExists(filename))
{
LLSD userSettings;
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -173,7 +173,7 @@ void LLAutoReplace::loadFromSettings()
if(gDirUtilp->fileExists(defaultName))
{
LLSD appDefault;
llifstream file;
std::ifstream file;
file.open(defaultName.c_str());
if (file.is_open())
{
@ -209,7 +209,7 @@ void LLAutoReplace::loadFromSettings()
void LLAutoReplace::saveToUserSettings()
{
std::string filename=getUserSettingsFileName();
llofstream file;
std::ofstream file;
file.open(filename.c_str());
LLSDSerialize::toPrettyXML(mSettings.asLLSD(), file);
file.close();

4
indra/newview/llavatariconctrl.cpp
View File

@ -76,7 +76,7 @@ void LLAvatarIconIDCache::load ()
// build filename for each user
std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, mFilename);
llifstream file(resolved_filename.c_str());
std::ifstream file(resolved_filename.c_str());
if (!file.is_open())
return;
@ -114,7 +114,7 @@ void LLAvatarIconIDCache::save ()
std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, mFilename);
// open a file for writing
llofstream file (resolved_filename.c_str());
std::ofstream file (resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't open avatar icons cache file\"" << mFilename << "\" for writing" << LL_ENDL;

2
indra/newview/llcommandlineparser.cpp
View File

@ -621,7 +621,7 @@ void LLControlGroupCLP::configure(const std::string& config_filename, LLControlG
// members of a control group.
LLSD clpConfigLLSD;
llifstream input_stream;
std::ifstream input_stream;
input_stream.open(config_filename.c_str(), std::ios::in | std::ios::binary);
if(input_stream.is_open())

14
indra/newview/llfavoritesbar.cpp
View File

@ -1469,7 +1469,7 @@ void LLFavoritesOrderStorage::destroyClass()
std::string old_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
llifstream file;
std::ifstream file;
file.open(old_filename.c_str());
if (file.is_open())
{
@ -1507,7 +1507,7 @@ void LLFavoritesOrderStorage::load()
std::string filename = getSavedOrderFileName();
LLSD settings_llsd;
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -1541,7 +1541,7 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs()
std::string filename = getStoredFavoritesFilename();
if (!filename.empty())
{
llifstream in_file;
std::ifstream in_file;
in_file.open(filename.c_str());
LLSD fav_llsd;
if (in_file.is_open())
@ -1588,7 +1588,7 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs()
// as we'll compare it with the stored credentials in the login panel.
fav_llsd[av_name.getUserName()] = user_llsd;
llofstream file;
std::ofstream file;
file.open(filename.c_str());
if ( file.is_open() )
{
@ -1613,7 +1613,7 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
if (!filename.empty())
{
LLSD fav_llsd;
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -1630,7 +1630,7 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
fav_llsd.erase(av_name.getUserName());
}
llofstream out_file;
std::ofstream out_file;
out_file.open(filename.c_str());
if ( out_file.is_open() )
{
@ -1686,7 +1686,7 @@ void LLFavoritesOrderStorage::save()
settings_llsd[iter->first.asString()] = iter->second;
}
llofstream file;
std::ofstream file;
file.open(filename.c_str());
if ( file.is_open() )
{

2
indra/newview/llfeaturemanager.cpp
View File

@ -326,7 +326,7 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
{
LL_INFOS("RenderInit") << "Attempting to parse feature table from " << filename << LL_ENDL;
llifstream file;
std::ifstream file;
std::string name;
U32 version;

4
indra/newview/llfloaterabout.cpp
View File

@ -154,7 +154,7 @@ BOOL LLFloaterAbout::postBuild()
// Get the names of contributors, extracted from .../doc/contributions.txt by viewer_manifest.py at build time
std::string contributors_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"contributors.txt");
llifstream contrib_file;
std::ifstream contrib_file;
std::string contributors;
contrib_file.open(contributors_path.c_str()); /* Flawfinder: ignore */
if (contrib_file.is_open())
@ -172,7 +172,7 @@ BOOL LLFloaterAbout::postBuild()
// Get the Versions and Copyrights, created at build time
std::string licenses_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"packages-info.txt");
llifstream licenses_file;
std::ifstream licenses_file;
licenses_file.open(licenses_path.c_str()); /* Flawfinder: ignore */
if (licenses_file.is_open())
{

4
indra/newview/llfloaterautoreplacesettings.cpp
View File

@ -353,7 +353,7 @@ void LLFloaterAutoReplaceSettings::onImportList()
LLFilePicker& picker = LLFilePicker::instance();
if( picker.getOpenFile( LLFilePicker::FFLOAD_XML) )
{
llifstream file;
std::ifstream file;
file.open(picker.getFirstFile().c_str());
LLSD newList;
if (file.is_open())
@ -545,7 +545,7 @@ void LLFloaterAutoReplaceSettings::onExportList()
LLFilePicker& picker = LLFilePicker::instance();
if( picker.getSaveFile( LLFilePicker::FFSAVE_XML, listFileName) )
{
llofstream file;
std::ofstream file;
file.open(picker.getFirstFile().c_str());
LLSDSerialize::toPrettyXML(*list, file);
file.close();

4
indra/newview/llfloatermodelpreview.cpp
View File

@ -2155,7 +2155,7 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
S32 file_size = (S32) stat.st_size;
llifstream ifstream(filename.c_str(), std::ifstream::in | std::ifstream::binary);
std::ifstream ifstream(filename.c_str(), std::ifstream::in | std::ifstream::binary);
LLSD data;
LLSDSerialize::fromBinary(data, ifstream, file_size);
ifstream.close();
@ -3513,7 +3513,7 @@ void LLModelPreview::saveUploadData(const std::string& filename, bool save_skinw
data["instance"][i] = instance.asLLSD();
}
llofstream out(filename.c_str(), std::ios_base::out | std::ios_base::binary);
std::ofstream out(filename.c_str(), std::ios_base::out | std::ios_base::binary);
LLSDSerialize::toBinary(data, out);
out.flush();
out.close();

4
indra/newview/llfloaterspellchecksettings.cpp
View File

@ -351,7 +351,7 @@ void LLFloaterSpellCheckerImport::onBtnOK()
LLSD custom_dict_map;
std::string custom_filename(LLSpellChecker::getDictionaryUserPath() + "user_dictionaries.xml");
llifstream custom_file_in(custom_filename.c_str());
std::ifstream custom_file_in(custom_filename.c_str());
if (custom_file_in.is_open())
{
LLSDSerialize::fromXMLDocument(custom_dict_map, custom_file_in);
@ -373,7 +373,7 @@ void LLFloaterSpellCheckerImport::onBtnOK()
custom_dict_map.append(custom_dict_info);
}
llofstream custom_file_out(custom_filename.c_str(), std::ios::trunc);
std::ofstream custom_file_out(custom_filename.c_str(), std::ios::trunc);
if (custom_file_out.is_open())
{
LLSDSerialize::toPrettyXML(custom_dict_map, custom_file_out);

4
indra/newview/lllocationhistory.cpp
View File

@ -127,7 +127,7 @@ void LLLocationHistory::save() const
}
// open a file for writing
llofstream file(resolved_filename.c_str());
std::ofstream file(resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't open location history file \"" << mFilename << "\" for writing" << LL_ENDL;
@ -148,7 +148,7 @@ void LLLocationHistory::load()
// build filename for each user
std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
llifstream file(resolved_filename.c_str());
std::ifstream file(resolved_filename.c_str());
if (!file.is_open())
{

2
indra/newview/lllogchat.cpp
View File

@ -302,7 +302,7 @@ void LLLogChat::saveHistory(const std::string& filename,
return;
}
llofstream file(LLLogChat::makeLogFileName(filename).c_str(), std::ios_base::app);
std::ofstream file(LLLogChat::makeLogFileName(filename).c_str(), std::ios_base::app);
if (!file.is_open())
{
LL_WARNS() << "Couldn't open chat history log! - " + filename << LL_ENDL;

4
indra/newview/llnotificationstorage.cpp
View File

@ -87,7 +87,7 @@ LLNotificationStorage::~LLNotificationStorage()
bool LLNotificationStorage::writeNotifications(const LLSD& pNotificationData) const
{
llofstream notifyFile(mFileName.c_str());
std::ofstream notifyFile(mFileName.c_str());
bool didFileOpen = notifyFile.is_open();
if (!didFileOpen)
@ -113,7 +113,7 @@ bool LLNotificationStorage::readNotifications(LLSD& pNotificationData, bool is_n
pNotificationData.clear();
llifstream notifyFile(filename.c_str());
std::ifstream notifyFile(filename.c_str());
didFileRead = notifyFile.is_open();
if (!didFileRead)
{

2
indra/newview/llpanellogin.cpp
View File

@ -307,7 +307,7 @@ void LLPanelLogin::addFavoritesToStartLocation()
updateLoginButtons();
LLSD fav_llsd;
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (!file.is_open())
{

4
indra/newview/llpanelmaininventory.cpp
View File

@ -162,7 +162,7 @@ BOOL LLPanelMainInventory::postBuild()
// Now load the stored settings from disk, if available.
std::string filterSaveName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, FILTERS_FILENAME));
LL_INFOS() << "LLPanelMainInventory::init: reading from " << filterSaveName << LL_ENDL;
llifstream file(filterSaveName.c_str());
std::ifstream file(filterSaveName.c_str());
LLSD savedFilterState;
if (file.is_open())
{
@ -243,7 +243,7 @@ LLPanelMainInventory::~LLPanelMainInventory( void )
}
std::string filterSaveName(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, FILTERS_FILENAME));
llofstream filtersFile(filterSaveName.c_str());
std::ofstream filtersFile(filterSaveName.c_str());
if(!LLSDSerialize::toPrettyXML(filterRoot, filtersFile))
{
LL_WARNS() << "Could not write to filters save file " << filterSaveName << LL_ENDL;

4
indra/newview/llsearchhistory.cpp
View File

@ -43,7 +43,7 @@ bool LLSearchHistory::load()
{
// build filename for each user
std::string resolved_filename = getHistoryFilePath();
llifstream file(resolved_filename.c_str());
std::ifstream file(resolved_filename.c_str());
if (!file.is_open())
{
return false;
@ -76,7 +76,7 @@ bool LLSearchHistory::save()
// build filename for each user
std::string resolved_filename = getHistoryFilePath();
// open a file for writing
llofstream file(resolved_filename.c_str());
std::ofstream file(resolved_filename.c_str());
if (!file.is_open())
{
return false;

10
indra/newview/llsechandler_basic.cpp
View File

@ -640,7 +640,7 @@ LLBasicCertificateStore::~LLBasicCertificateStore()
// persist the store
void LLBasicCertificateStore::save()
{
llofstream file_store(mFilename.c_str(), std::ios_base::binary);
std::ofstream file_store(mFilename.c_str(), std::ios_base::binary);
if(!file_store.fail())
{
for(iterator cert = begin();
@ -1245,8 +1245,8 @@ void LLSecAPIBasicHandler::_readProtectedData()
{
// attempt to load the file into our map
LLPointer<LLSDParser> parser = new LLSDXMLParser();
llifstream protected_data_stream(mProtectedDataFilename.c_str(),
llifstream::binary);
std::ifstream protected_data_stream(mProtectedDataFilename.c_str(),
std::ifstream::binary);
if (!protected_data_stream.fail()) {
U8 salt[STORE_SALT_SIZE];
@ -1330,7 +1330,7 @@ void LLSecAPIBasicHandler::_writeProtectedData()
// an error.
std::string tmp_filename = mProtectedDataFilename + ".tmp";
llofstream protected_data_stream(tmp_filename.c_str(),
std::ofstream protected_data_stream(tmp_filename.c_str(),
std::ios_base::binary);
try
{
@ -1568,7 +1568,7 @@ std::string LLSecAPIBasicHandler::_legacyLoadPassword()
{
const S32 HASHED_LENGTH = 32;
std::vector<U8> buffer(HASHED_LENGTH);
llifstream password_file(mLegacyPasswordPath.c_str(), llifstream::binary);
std::ifstream password_file(mLegacyPasswordPath.c_str(), std::ifstream::binary);
if(password_file.fail())
{

4
indra/newview/llsyntaxid.cpp
View File

@ -83,7 +83,7 @@ public:
const std::string xml = str.str();
// save the str to disk, usually to the cache.
llofstream file(mFileSpec.c_str(), std::ios_base::out);
std::ofstream file(mFileSpec.c_str(), std::ios_base::out);
file.write(xml.c_str(), str.str().size());
file.close();
@ -268,7 +268,7 @@ void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD()
void LLSyntaxIdLSL::loadKeywordsIntoLLSD()
{
LLSD content;
llifstream file;
std::ifstream file;
file.open(mFullFileSpec.c_str());
if (file.is_open())
{

4
indra/newview/llteleporthistorystorage.cpp
View File

@ -164,7 +164,7 @@ void LLTeleportHistoryStorage::save()
std::string resolvedFilename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
// open the history file for writing
llofstream file(resolvedFilename.c_str());
std::ofstream file(resolvedFilename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't open teleport history file \"" << mFilename << "\" for writing" << LL_ENDL;
@ -186,7 +186,7 @@ void LLTeleportHistoryStorage::load()
std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
// open the history file for reading
llifstream file(resolved_filename.c_str());
std::ifstream file(resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't load teleport history from file \"" << mFilename << "\"" << LL_ENDL;

4
indra/newview/llurlhistory.cpp
View File

@ -46,7 +46,7 @@ bool LLURLHistory::loadFile(const std::string& filename)
std::string user_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + filename);
llifstream file(user_filename.c_str());
std::ifstream file(user_filename.c_str());
if (file.is_open())
{
LLSDSerialize::fromXML(data, file);
@ -79,7 +79,7 @@ bool LLURLHistory::saveFile(const std::string& filename)
}
temp_str += gDirUtilp->getDirDelimiter() + filename;
llofstream out(temp_str.c_str());
std::ofstream out(temp_str.c_str());
if (!out.good())
{
LL_WARNS() << "Unable to open " << temp_str << " for output." << LL_ENDL;

4
indra/newview/llurlwhitelist.cpp
View File

@ -87,7 +87,7 @@ bool LLUrlWhiteList::load ()
std::string resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename );
// open a file for reading
llifstream file(resolvedFilename.c_str());
std::ifstream file(resolvedFilename.c_str());
if ( file.is_open () )
{
// add each line in the file to the list
@ -122,7 +122,7 @@ bool LLUrlWhiteList::save ()
}
// open a file for writing
llofstream file(resolvedFilename.c_str());
std::ofstream file(resolvedFilename.c_str());
if ( file.is_open () )
{
// for each entry we have

4
indra/newview/llviewermedia.cpp
View File

@ -1278,7 +1278,7 @@ void LLViewerMedia::loadCookieFile()
}
// open the file for reading
llifstream file(resolved_filename.c_str());
std::ifstream file(resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't load plugin cookies from file \"" << PLUGIN_COOKIE_FILE_NAME << "\"" << LL_ENDL;
@ -1320,7 +1320,7 @@ void LLViewerMedia::saveCookieFile()
}
// open a file for writing
llofstream file(resolved_filename.c_str());
std::ofstream file(resolved_filename.c_str());
if (!file.is_open())
{
LL_WARNS() << "can't open plugin cookie file \"" << PLUGIN_COOKIE_FILE_NAME << "\" for writing" << LL_ENDL;

2
indra/newview/llviewernetwork.cpp
View File

@ -135,7 +135,7 @@ void LLGridManager::initialize(const std::string& grid_file)
"Aditi");
LLSD other_grids;
llifstream llsd_xml;
std::ifstream llsd_xml;
if (!grid_file.empty())
{
LL_INFOS("GridManager")<<"Grid configuration file '"<<grid_file<<"'"<<LL_ENDL;

2
indra/newview/llviewerobject.cpp
View File

@ -3001,7 +3001,7 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
BOOL LLViewerObject::loadTaskInvFile(const std::string& filename)
{
std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename);
llifstream ifs(filename_and_local_path.c_str());
std::ifstream ifs(filename_and_local_path.c_str());
if(ifs.good())
{
char buffer[MAX_STRING]; /* Flawfinder: ignore */

4
indra/newview/llviewertexturelist.cpp
View File

@ -179,7 +179,7 @@ void LLViewerTextureList::doPrefetchImages()
// Pre-fetch textures from last logout
LLSD imagelist;
std::string filename = get_texture_list_name();
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -273,7 +273,7 @@ void LLViewerTextureList::shutdown()
if (count > 0 && !gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "").empty())
{
std::string filename = get_texture_list_name();
llofstream file;
std::ofstream file;
file.open(filename.c_str());
LL_DEBUGS() << "saving " << imagelist.size() << " image list entries" << LL_ENDL;
LLSDSerialize::toPrettyXML(imagelist, file);

4
indra/newview/llvoiceclient.cpp
View File

@ -1023,7 +1023,7 @@ void LLSpeakerVolumeStorage::load()
LL_INFOS("Voice") << "Loading stored speaker volumes from: " << filename << LL_ENDL;
LLSD settings_llsd;
llifstream file;
std::ifstream file;
file.open(filename.c_str());
if (file.is_open())
{
@ -1066,7 +1066,7 @@ void LLSpeakerVolumeStorage::save()
settings_llsd[iter->first.asString()] = volume;
}
llofstream file;
std::ofstream file;
file.open(filename.c_str());
LLSDSerialize::toPrettyXML(settings_llsd, file);
}

4
indra/newview/llwaterparammanager.cpp
View File

@ -110,7 +110,7 @@ void LLWaterParamManager::loadPresetsFromDir(const std::string& dir)
bool LLWaterParamManager::loadPreset(const std::string& path)
{
llifstream xml_file;
std::ifstream xml_file;
std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true));
xml_file.open(path.c_str());
@ -150,7 +150,7 @@ void LLWaterParamManager::savePreset(const std::string & name)
paramsData = mParamList[name].getAll();
// write to file
llofstream presetsXML(pathName.c_str());
std::ofstream presetsXML(pathName.c_str());
LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
presetsXML.close();

2
indra/newview/llwearablelist.cpp
View File

@ -113,7 +113,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
else if (status >= 0)
{
// read the file
llifstream ifs(filename, llifstream::binary);
std::ifstream ifs(filename, std::ifstream::binary);
if( !ifs.is_open() )
{
LL_WARNS("Wearable") << "Bad Wearable Asset: unable to open file: '" << filename << "'" << LL_ENDL;

4
indra/newview/llwldaycycle.cpp
View File

@ -109,7 +109,7 @@ LLSD LLWLDayCycle::loadDayCycleFromPath(const std::string& file_path)
{
LL_INFOS("Windlight") << "Loading DayCycle settings from " << file_path << LL_ENDL;
llifstream day_cycle_xml(file_path.c_str());
std::ifstream day_cycle_xml(file_path.c_str());
if (day_cycle_xml.is_open())
{
// load and parse it
@ -137,7 +137,7 @@ void LLWLDayCycle::save(const std::string& file_path)
{
LLSD day_data = asLLSD();
llofstream day_cycle_xml(file_path.c_str());
std::ofstream day_cycle_xml(file_path.c_str());
LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
formatter->format(day_data, day_cycle_xml, LLSDFormatter::OPTIONS_PRETTY);
day_cycle_xml.close();

4
indra/newview/llwlparammanager.cpp
View File

@ -293,7 +293,7 @@ void LLWLParamManager::loadPresetsFromDir(const std::string& dir)
bool LLWLParamManager::loadPreset(const std::string& path)
{
llifstream xml_file;
std::ifstream xml_file;
std::string name(gDirUtilp->getBaseFileName(LLURI::unescape(path), /*strip_exten = */ true));
xml_file.open(path.c_str());
@ -334,7 +334,7 @@ void LLWLParamManager::savePreset(LLWLParamKey key)
paramsData = mParamList[key].getAll();
// write to file
llofstream presetsXML(pathName.c_str());
std::ofstream presetsXML(pathName.c_str());
LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
presetsXML.close();

4
indra/newview/tests/llsechandler_basic_test.cpp
View File

@ -585,7 +585,7 @@ namespace tut
LLMachineID::getUniqueID(unique_id, sizeof(unique_id));
LLXORCipher cipher2(unique_id, sizeof(unique_id));
cipher2.encrypt((U8*)&decoded_password[0], length);
llofstream password_file("test_password.dat", std::ofstream::binary);
std::ofstream password_file("test_password.dat", std::ofstream::binary);
password_file.write(&decoded_password[0], length);
password_file.close();
@ -719,7 +719,7 @@ namespace tut
test_store=NULL;
// instantiate a cert store from a file
llofstream certstorefile("mycertstore.pem", std::ios::out);
std::ofstream certstorefile("mycertstore.pem", std::ios::out);
certstorefile << mPemChildCert << std::endl << mPemTestCert << std::endl;
certstorefile.close();
// validate loaded certs

6
indra/newview/tests/llslurl_test.cpp
View File

@ -152,7 +152,7 @@ namespace tut
template<> template<>
void slurlTestObject::test<1>()
{
llofstream gridfile(TEST_FILENAME);
std::ofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
@ -269,7 +269,7 @@ namespace tut
template<> template<>
void slurlTestObject::test<2>()
{
llofstream gridfile(TEST_FILENAME);
std::ofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
@ -302,7 +302,7 @@ namespace tut
template<> template<>
void slurlTestObject::test<3>()
{
llofstream gridfile(TEST_FILENAME);
std::ofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();

4
indra/newview/tests/llviewernetwork_test.cpp
View File

@ -245,7 +245,7 @@ namespace tut
template<> template<>
void viewerNetworkTestObject::test<2>()
{
llofstream gridfile(TEST_FILENAME);
std::ofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();
@ -376,7 +376,7 @@ namespace tut
void viewerNetworkTestObject::test<7>()
{
// adding a grid with simply a name will populate the values.
llofstream gridfile(TEST_FILENAME);
std::ofstream gridfile(TEST_FILENAME);
gridfile << gSampleGridFile;
gridfile.close();

2
indra/test/llmessageconfig_tut.cpp
View File

@ -68,7 +68,7 @@ namespace tut
void writeConfigFile(const LLSD& config)
{
llofstream file((mTestConfigDir + "/message.xml").c_str());
std::ofstream file((mTestConfigDir + "/message.xml").c_str());
if (file.is_open())
{
LLSDSerialize::toPrettyXML(config, file);

2
indra/test/message_tut.cpp
View File

@ -120,7 +120,7 @@ namespace tut
void writeConfigFile(const LLSD& config)
{
std::string ostr(mTestConfigDir + mSep + "message.xml");
llofstream file(ostr.c_str());
std::ofstream file(ostr.c_str());
if (file.is_open())
{
LLSDSerialize::toPrettyXML(config, file);

4
indra/viewer_components/updater/CMakeLists.txt
View File

@ -70,12 +70,12 @@ if(LL_TESTS)
)
# *NOTE:Mani - I was trying to use the preprocessor seam to mock out
# llifstream (and other) llcommon classes. I didn't work
# std::ifstream (and other) llcommon classes. I didn't work
# because of the windows declspec(dllimport)attribute.
#set_source_files_properties(
# llupdaterservice.cpp
# PROPERTIES
# LL_TEST_ADDITIONAL_CFLAGS "-Dllifstream=llus_mock_llifstream"
# LL_TEST_ADDITIONAL_CFLAGS "-Dstd::ifstream=llus_mock_std::ifstream"
# )
LL_ADD_PROJECT_UNIT_TESTS(llupdaterservice "${llupdater_service_TEST_SOURCE_FILES}")

10
indra/viewer_components/updater/llupdatedownloader.cpp
View File

@ -67,7 +67,7 @@ private:
LLUpdateDownloader::Client & mClient;
CURL * mCurl;
LLSD mDownloadData;
llofstream mDownloadStream;
std::ofstream mDownloadStream;
unsigned char mDownloadPercent;
std::string mDownloadRecordPath;
curl_slist * mHeaderList;
@ -270,7 +270,7 @@ void LLUpdateDownloader::Implementation::resume(void)
}
mDownloadRecordPath = downloadMarkerPath();
llifstream dataStream(mDownloadRecordPath.c_str());
std::ifstream dataStream(mDownloadRecordPath.c_str());
if(!dataStream)
{
mClient.downloadError("no download marker");
@ -362,7 +362,7 @@ size_t LLUpdateDownloader::Implementation::onHeader(void * buffer, size_t size)
LL_INFOS("UpdaterService") << "download size is " << size << LL_ENDL;
mDownloadData["size"] = LLSD(LLSD::Integer(size));
llofstream odataStream(mDownloadRecordPath.c_str());
std::ofstream odataStream(mDownloadRecordPath.c_str());
LLSDSerialize::toPrettyXML(mDownloadData, odataStream);
} catch (std::exception const & e) {
LL_WARNS("UpdaterService") << "unable to read content length ("
@ -534,7 +534,7 @@ void LLUpdateDownloader::Implementation::startDownloading(LLURI const & uri, std
<< " from " << uri.asString() << LL_ENDL;
LL_INFOS("UpdaterService") << "hash of file is " << hash << LL_ENDL;
llofstream dataStream(mDownloadRecordPath.c_str());
std::ofstream dataStream(mDownloadRecordPath.c_str());
LLSDSerialize::toPrettyXML(mDownloadData, dataStream);
mDownloadStream.open(filePath.c_str(), std::ios_base::out | std::ios_base::binary);
@ -570,7 +570,7 @@ bool LLUpdateDownloader::Implementation::validateOrRemove(const std::string& fil
bool LLUpdateDownloader::Implementation::validateDownload(const std::string& filePath)
{
llifstream fileStream(filePath.c_str(), std::ios_base::in | std::ios_base::binary);
std::ifstream fileStream(filePath.c_str(), std::ios_base::in | std::ios_base::binary);
if(!fileStream)
{
LL_INFOS("UpdaterService") << "can't open " << filePath << ", invalid" << LL_ENDL;

8
indra/viewer_components/updater/llupdaterservice.cpp
View File

@ -285,7 +285,7 @@ bool LLUpdaterServiceImpl::checkForInstall(bool launchInstaller)
{
bool foundInstall = false; // return true if install is found.
llifstream update_marker(update_marker_path().c_str(),
std::ifstream update_marker(update_marker_path().c_str(),
std::ios::in | std::ios::binary);
if(update_marker.is_open())
@ -365,7 +365,7 @@ bool LLUpdaterServiceImpl::checkForResume()
std::string download_marker_path = mUpdateDownloader.downloadMarkerPath();
if(LLFile::isfile(download_marker_path))
{
llifstream download_marker_stream(download_marker_path.c_str(),
std::ifstream download_marker_stream(download_marker_path.c_str(),
std::ios::in | std::ios::binary);
if(download_marker_stream.is_open())
{
@ -460,7 +460,7 @@ void LLUpdaterServiceImpl::downloadComplete(LLSD const & data)
// Save out the download data to the SecondLifeUpdateReady
// marker file.
llofstream update_marker(update_marker_path().c_str());
std::ofstream update_marker(update_marker_path().c_str());
LLSDSerialize::toPrettyXML(data, update_marker);
LLSD event;
@ -558,7 +558,7 @@ bool LLUpdaterServiceImpl::onMainLoop(LLSD const & event)
LL_DEBUGS("UpdaterService") << "found marker " << ll_install_failed_marker_path() << LL_ENDL;
int requiredValue = 0;
{
llifstream stream(ll_install_failed_marker_path().c_str());
std::ifstream stream(ll_install_failed_marker_path().c_str());
stream >> requiredValue;
if(stream.fail())
{