diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
| commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
| tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/llvfs | |
| parent | a75b85112ffa4b7140561083c2e5de05fb510805 (diff) | |
QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 8 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 417e48c07c..66d333ccaf 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -597,7 +597,7 @@ LLVFS::LLVFS(const char *index_filename, const char *data_filename, const BOOL r return; } sprintf(marker, "%s.open", mDataFilename); /* Flawfinder: ignore */ - FILE* marker_fp = LLFile::fopen(marker, "w"); /* Flawfinder: ignore */ + LLFILE* marker_fp = LLFile::fopen(marker, "w"); /* Flawfinder: ignore */ if (marker_fp) { fclose(marker_fp); @@ -2134,7 +2134,7 @@ void LLVFS::dumpFiles() //============================================================================ // static -FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) +LLFILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) { #if LL_WINDOWS @@ -2142,7 +2142,7 @@ FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) #else - FILE *fp; + LLFILE *fp; int fd; // first test the lock in a non-destructive way @@ -2192,7 +2192,7 @@ FILE *LLVFS::openAndLock(const char *filename, const char *mode, BOOL read_lock) } // static -void LLVFS::unlockAndClose(FILE *fp) +void LLVFS::unlockAndClose(LLFILE *fp) { if (fp) { diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h index a068c0d644..8ed0afe12f 100644 --- a/indra/llvfs/llvfs.h +++ b/indra/llvfs/llvfs.h @@ -131,8 +131,8 @@ protected: void sync(LLVFSFileBlock *block, BOOL remove = FALSE); void presizeDataFile(const U32 size); - static FILE *openAndLock(const char *filename, const char *mode, BOOL read_lock); - static void unlockAndClose(FILE *fp); + static LLFILE *openAndLock(const char *filename, const char *mode, BOOL read_lock); + static void unlockAndClose(LLFILE *fp); // Can initiate LRU-based file removal to make space. // The immune file block will not be removed. @@ -153,8 +153,8 @@ protected: typedef std::multimap<U32, LLVFSBlock*> blocks_location_map_t; blocks_location_map_t mFreeBlocksByLocation; - FILE *mDataFP; - FILE *mIndexFP; + LLFILE *mDataFP; + LLFILE *mIndexFP; std::deque<S32> mIndexHoles; |