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

MAINT-6828 Removed unnessesary spam in logs

master
andreykproductengine 2016-10-13 22:49:06 +03:00
parent 740159f004
commit 759b4f14d8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/llfile.cpp
View File

@ -239,7 +239,7 @@ int LLFile::close(LLFILE * file)
}
int LLFile::remove(const std::string& filename)
int LLFile::remove(const std::string& filename, int supress_error)
{
#if LL_WINDOWS
std::string utf8filename = filename;
@ -248,7 +248,7 @@ int LLFile::remove(const std::string& filename)
#else
int rc = ::remove(filename.c_str());
#endif
return warnif("remove", filename, rc);
return warnif("remove", filename, rc, supress_error);
}
int LLFile::rename(const std::string& filename, const std::string& newname)

2
indra/llcommon/llfile.h
View File

@ -72,7 +72,7 @@ public:
static int mkdir(const std::string& filename, int perms = 0700);
static int rmdir(const std::string& filename);
static int remove(const std::string& filename);
static int remove(const std::string& filename, int supress_error = 0);
static int rename(const std::string& filename,const std::string& newname);
static bool copy(const std::string from, const std::string to);

6
indra/llmessage/llxfer_file.cpp
View File

@ -98,12 +98,12 @@ void LLXfer_File::cleanup ()
mFp = NULL;
}
LLFile::remove(mTempFilename);
LLFile::remove(mTempFilename, ENOENT);
if (mDeleteLocalOnCompletion)
{
LL_DEBUGS() << "Removing file: " << mLocalFilename << LL_ENDL;
LLFile::remove(mLocalFilename);
LLFile::remove(mLocalFilename, ENOENT);
}
else
{
@ -321,7 +321,7 @@ S32 LLXfer_File::processEOF()
mCallbackResult = flushval;
}
LLFile::remove(mLocalFilename);
LLFile::remove(mLocalFilename, ENOENT);
if (!mCallbackResult)
{

2
indra/llmessage/llxfermanager.cpp
View File

@ -441,7 +441,7 @@ void LLXferManager::requestFile(const std::string& local_filename,
if(delete_remote_on_completion &&
(remote_filename.substr(remote_filename.length()-4) == ".tmp"))
{
LLFile::remove(local_filename);
LLFile::remove(local_filename, ENOENT);
}
((LLXfer_File *)xferp)->initializeRequest(
getNextID(),