1 files changed, 8 insertions, 8 deletions

diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 69d580a..a92c434 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -60,7 +60,7 @@ LLXfer_VFile::LLXfer_VFile (LLVFS *vfs, const LLUUID &local_id, LLAssetType::ETy
 
 LLXfer_VFile::~LLXfer_VFile ()
 {
-        free();
+        cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -74,15 +74,15 @@ void LLXfer_VFile::init (LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType
 
         mVFile = NULL;
 
-        char id_string[UUID_STR_LENGTH];                        /* Flawfinder : ignore */
+        std::string id_string;
         mLocalID.toString(id_string);
 
-        snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType));           /* Flawfinder : ignore */
+        mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
 }
         
 ///////////////////////////////////////////////////////////
 
-void LLXfer_VFile::free ()
+void LLXfer_VFile::cleanup ()
 {
         LLVFile file(mVFS, mTempID, mType, LLVFile::WRITE);
         file.remove();
@@ -90,7 +90,7 @@ void LLXfer_VFile::free ()
         delete mVFile;
         mVFile = NULL;
 
-        LLXfer::free();
+        LLXfer::cleanup();
 }
 
 ///////////////////////////////////////////////////////////
@@ -118,10 +118,10 @@ S32 LLXfer_VFile::initializeRequest(U64 xfer_id,
         mCallbackDataHandle = user_data;
         mCallbackResult = LL_ERR_NOERR;
 
-        char id_string[UUID_STR_LENGTH];                /* Flawfinder : ignore */
+        std::string id_string;
         mLocalID.toString(id_string);
 
-        snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType));           /* Flawfinder : ignore */
+        mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
 
         llinfos << "Requesting " << mName << llendl;
 
@@ -328,7 +328,7 @@ BOOL LLXfer_VFile::matchesRemoteFile(const LLUUID &id, LLAssetType::EType type)
 
 //////////////////////////////////////////////////////////
 
-const char * LLXfer_VFile::getName() 
+std::string LLXfer_VFile::getFileName() 
 {
         return mName;
 }