diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp index 039e7b2d8fc3e997875a1637f7d48d2935c13fd6..77fd54a37366103b62f5124053ea937973a81a30 100644 --- a/indra/llfilesystem/llfilesystem.cpp +++ b/indra/llfilesystem/llfilesystem.cpp @@ -206,7 +206,7 @@ S32 LLFileSystem::getSize() { S32 file_size = 0; llstat stat; - if (LLFile::stat(mFilePath.c_str(), &stat) == 0) + if (LLFile::stat(mFilePath, &stat) == 0) { file_size = stat.st_size; } diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 9803789a1e83e2780cddcfaa53a46ad398113a6c..6a8b1b7a6663639edb2c0c9544e73eb8065c429b 100644 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -637,7 +637,7 @@ void LLXUIXSDWriter::writeXSD(const std::string& type_name, const std::string& p } } - LLFILE* xsd_file = LLFile::fopen(file_name.c_str(), "w"); + LLFILE* xsd_file = LLFile::fopen(file_name, "w"); LLXMLNode::writeHeaderToFile(xsd_file); root_nodep->writeToFile(xsd_file); fclose(xsd_file); diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index 6029f6aba996c2b6567f4be760c565f3564c2d34..c841cdf1f6c2a1e82ccd9649072dd2c627a9743d 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -493,7 +493,7 @@ BOOL LLFloaterUIPreview::postBuild() if((found = iter.next(language_directory))) // get next directory { std::string full_path = gDirUtilp->add(xui_dir, language_directory); - if(LLFile::isfile(full_path.c_str())) // if it's not a directory, skip it + if(LLFile::isfile(full_path)) // if it's not a directory, skip it { continue; } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5fb23c97e2cc9288a952b5df5176224fa05c702c..4455d9fe811c77ec20133661dcd7d699c4b123ed 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -483,7 +483,7 @@ bool idle_startup() if (!found_template) { message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg"); - found_template = LLFile::fopen(message_template_path.c_str(), "r"); /* Flawfinder: ignore */ + found_template = LLFile::fopen(message_template_path, "r"); /* Flawfinder: ignore */ } #elif LL_DARWIN // On Mac dev builds, message_template.msg lives in: @@ -493,7 +493,7 @@ bool idle_startup() message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "message_template.msg"); - found_template = LLFile::fopen(message_template_path.c_str(), "r"); /* Flawfinder: ignore */ + found_template = LLFile::fopen(message_template_path, "r"); /* Flawfinder: ignore */ } #endif @@ -539,7 +539,7 @@ bool idle_startup() // be located in indra/build-vc**/newview/<config>/app_settings. std::string message_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message.xml"); - if (!LLFile::isfile(message_path.c_str())) + if (!LLFile::isfile(message_path)) { LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "")); }