From 3ca3ea75c333078013914e174564340f894573e2 Mon Sep 17 00:00:00 2001
From: Frederick Martian <fredmartian@gmail.com>
Date: Sat, 25 Oct 2025 17:08:35 +0200
Subject: Add a new static function LLFile::size() to determine the size of a
 file_name. Replace LLAPRFile::remove(), LLAPRFile::size() and
 LLAPRFile::isExist() with according functions from LLFile and retire these
 LLAPRFile methods and the never used LLAPRFile::rename(),
 LLAPRFile::makeDir() and LLAPRFile::removeDir() functions. Also clean up
 remarks about the threading safety of the APRCachePool, which is not used in
 these locations anymore.

---
 indra/llcommon/llapr.cpp | 118 -----------------------------------------------
 1 file changed, 118 deletions(-)

(limited to 'indra/llcommon/llapr.cpp')

diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index eeff2694a7..cffd6b7bc0 100644
--- a/indra/llcommon/llapr.cpp
+++ b/indra/llcommon/llapr.cpp
@@ -628,124 +628,6 @@ S32 LLAPRFile::writeEx(const std::string& filename, const void *buf, S32 offset,
     return (S32)bytes_written;
 }
 
-//static
-bool LLAPRFile::remove(const std::string& filename, LLVolatileAPRPool* pool)
-{
-    apr_status_t s;
-
-    LLAPRFilePoolScope scope(pool);
-    s = apr_file_remove(filename.c_str(), scope.getVolatileAPRPool());
-
-    if (s != APR_SUCCESS)
-    {
-        ll_apr_warn_status(s);
-        LL_WARNS("APR") << " Attempting to remove filename: " << filename << LL_ENDL;
-        return false;
-    }
-    return true;
-}
-
-//static
-bool LLAPRFile::rename(const std::string& filename, const std::string& newname, LLVolatileAPRPool* pool)
-{
-    apr_status_t s;
-
-    LLAPRFilePoolScope scope(pool);
-    s = apr_file_rename(filename.c_str(), newname.c_str(), scope.getVolatileAPRPool());
-
-    if (s != APR_SUCCESS)
-    {
-        ll_apr_warn_status(s);
-        LL_WARNS("APR") << " Attempting to rename filename: " << filename << LL_ENDL;
-        return false;
-    }
-    return true;
-}
-
-//static
-bool LLAPRFile::isExist(const std::string& filename, LLVolatileAPRPool* pool, apr_int32_t flags)
-{
-    apr_file_t* apr_file;
-    apr_status_t s;
-
-    LLAPRFilePoolScope scope(pool);
-    s = apr_file_open(&apr_file, filename.c_str(), flags, APR_OS_DEFAULT, scope.getVolatileAPRPool());
-
-    if (s != APR_SUCCESS || !apr_file)
-    {
-        return false;
-    }
-    else
-    {
-        apr_file_close(apr_file) ;
-        return true;
-    }
-}
-
-//static
-S32 LLAPRFile::size(const std::string& filename, LLVolatileAPRPool* pool)
-{
-    apr_file_t* apr_file;
-    apr_finfo_t info;
-    apr_status_t s;
-
-    LLAPRFilePoolScope scope(pool);
-    s = apr_file_open(&apr_file, filename.c_str(), APR_READ, APR_OS_DEFAULT, scope.getVolatileAPRPool());
-
-    if (s != APR_SUCCESS || !apr_file)
-    {
-        return 0;
-    }
-    else
-    {
-        apr_status_t s = apr_file_info_get(&info, APR_FINFO_SIZE, apr_file);
-
-        apr_file_close(apr_file) ;
-
-        if (s == APR_SUCCESS)
-        {
-            return (S32)info.size;
-        }
-        else
-        {
-            return 0;
-        }
-    }
-}
-
-//static
-bool LLAPRFile::makeDir(const std::string& dirname, LLVolatileAPRPool* pool)
-{
-    apr_status_t s;
-
-    LLAPRFilePoolScope scope(pool);
-    s = apr_dir_make(dirname.c_str(), APR_FPROT_OS_DEFAULT, scope.getVolatileAPRPool());
-
-    if (s != APR_SUCCESS)
-    {
-        ll_apr_warn_status(s);
-        LL_WARNS("APR") << " Attempting to make directory: " << dirname << LL_ENDL;
-        return false;
-    }
-    return true;
-}
-
-//static
-bool LLAPRFile::removeDir(const std::string& dirname, LLVolatileAPRPool* pool)
-{
-    apr_status_t s;
-
-    LLAPRFilePoolScope scope(pool);
-    s = apr_file_remove(dirname.c_str(), scope.getVolatileAPRPool());
-
-    if (s != APR_SUCCESS)
-    {
-        ll_apr_warn_status(s);
-        LL_WARNS("APR") << " Attempting to remove directory: " << dirname << LL_ENDL;
-        return false;
-    }
-    return true;
-}
 //
 //end of static components of LLAPRFile
 //*******************************************************************************************************************************
-- 
cgit v1.3