Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop

1 files changed, 0 insertions, 222 deletions

diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp
index 06eb4c389f..e1d80c5dea 100644
--- a/indra/llcommon/llapr.cpp
+++ b/indra/llcommon/llapr.cpp
@@ -230,7 +230,6 @@ bool LLVolatileAPRPool::isFull()
 bool _ll_apr_warn_status(apr_status_t status, const char* file, int line)
 {
     if(APR_SUCCESS == status) return false;
-#if !LL_LINUX
     char buf[MAX_STRING];
     apr_strerror(status, buf, sizeof(buf));
 
@@ -260,7 +259,6 @@ bool _ll_apr_warn_status(apr_status_t status, const char* file, int line)
 #else
     LL_WARNS("APR") << "APR: " << file << ":" << line << " " << buf << " (0x" << std::hex << status << std::dec << ")" << LL_ENDL;
 #endif
-#endif
     return true;
 }
 
@@ -552,226 +550,6 @@ S32 LLAPRFile::seek(apr_file_t* file_handle, apr_seek_where_t where, S32 offset)
     }
 }
 
-//static
-S32 LLAPRFile::readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool)
-{
-    LL_PROFILE_ZONE_SCOPED;
-    //*****************************************
-    LLAPRFilePoolScope scope(pool);
-    apr_file_t* file_handle = open(filename, scope.getVolatileAPRPool(), APR_READ|APR_BINARY);
-    //*****************************************
-    if (!file_handle)
-    {
-        return 0;
-    }
-
-    llassert(offset >= 0);
-
-    if (offset > 0)
-        offset = LLAPRFile::seek(file_handle, APR_SET, offset);
-
-    apr_size_t bytes_read;
-    if (offset < 0)
-    {
-        bytes_read = 0;
-    }
-    else
-    {
-        bytes_read = nbytes ;
-        apr_status_t s = apr_file_read(file_handle, buf, &bytes_read);
-        if (s != APR_SUCCESS)
-        {
-            LL_WARNS("APR") << " Attempting to read filename: " << filename << LL_ENDL;
-            ll_apr_warn_status(s);
-            bytes_read = 0;
-        }
-        else
-        {
-            llassert_always(bytes_read <= 0x7fffffff);
-        }
-    }
-
-    //*****************************************
-    close(file_handle) ;
-    //*****************************************
-    return (S32)bytes_read;
-}
-
-//static
-S32 LLAPRFile::writeEx(const std::string& filename, const void *buf, S32 offset, S32 nbytes, LLVolatileAPRPool* pool)
-{
-    LL_PROFILE_ZONE_SCOPED;
-    apr_int32_t flags = APR_CREATE|APR_WRITE|APR_BINARY;
-    if (offset < 0)
-    {
-        flags |= APR_APPEND;
-        offset = 0;
-    }
-
-    //*****************************************
-    LLAPRFilePoolScope scope(pool);
-    apr_file_t* file_handle = open(filename, scope.getVolatileAPRPool(), flags);
-    //*****************************************
-    if (!file_handle)
-    {
-        return 0;
-    }
-
-    if (offset > 0)
-    {
-        offset = LLAPRFile::seek(file_handle, APR_SET, offset);
-    }
-
-    apr_size_t bytes_written;
-    if (offset < 0)
-    {
-        bytes_written = 0;
-    }
-    else
-    {
-        bytes_written = nbytes ;
-        apr_status_t s = apr_file_write(file_handle, buf, &bytes_written);
-        if (s != APR_SUCCESS)
-        {
-            LL_WARNS("APR") << "Attempting to write filename: " << filename << LL_ENDL;
-            if (APR_STATUS_IS_ENOSPC(s))
-            {
-                LLApp::notifyOutOfDiskSpace();
-            }
-            ll_apr_warn_status(s);
-            bytes_written = 0;
-        }
-        else
-        {
-            llassert_always(bytes_written <= 0x7fffffff);
-        }
-    }
-
-    //*****************************************
-    LLAPRFile::close(file_handle);
-    //*****************************************
-
-    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
 //*******************************************************************************************************************************