diff options
Diffstat (limited to 'linden/indra/llvfs/llvfs.h')
-rw-r--r-- | linden/indra/llvfs/llvfs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llvfs/llvfs.h b/linden/indra/llvfs/llvfs.h index 7465bb4..06015b6 100644 --- a/linden/indra/llvfs/llvfs.h +++ b/linden/indra/llvfs/llvfs.h | |||
@@ -78,7 +78,7 @@ class LLVFS | |||
78 | { | 78 | { |
79 | public: | 79 | public: |
80 | // Pass 0 to not presize | 80 | // Pass 0 to not presize |
81 | LLVFS(const char *index_filename, const char *data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash); | 81 | LLVFS(const std::string& index_filename, const std::string& data_filename, const BOOL read_only, const U32 presize, const BOOL remove_after_crash); |
82 | ~LLVFS(); | 82 | ~LLVFS(); |
83 | 83 | ||
84 | BOOL isValid() const { return (VFSVALID_OK == mValid); } | 84 | BOOL isValid() const { return (VFSVALID_OK == mValid); } |
@@ -131,8 +131,8 @@ protected: | |||
131 | void sync(LLVFSFileBlock *block, BOOL remove = FALSE); | 131 | void sync(LLVFSFileBlock *block, BOOL remove = FALSE); |
132 | void presizeDataFile(const U32 size); | 132 | void presizeDataFile(const U32 size); |
133 | 133 | ||
134 | static LLFILE *openAndLock(const char *filename, const char *mode, BOOL read_lock); | 134 | static LLFILE *openAndLock(const std::string& filename, const char* mode, BOOL read_lock); |
135 | static void unlockAndClose(LLFILE *fp); | 135 | static void unlockAndClose(FILE *fp); |
136 | 136 | ||
137 | // Can initiate LRU-based file removal to make space. | 137 | // Can initiate LRU-based file removal to make space. |
138 | // The immune file block will not be removed. | 138 | // The immune file block will not be removed. |
@@ -158,8 +158,8 @@ protected: | |||
158 | 158 | ||
159 | std::deque<S32> mIndexHoles; | 159 | std::deque<S32> mIndexHoles; |
160 | 160 | ||
161 | char *mIndexFilename; | 161 | std::string mIndexFilename; |
162 | char *mDataFilename; | 162 | std::string mDataFilename; |
163 | BOOL mReadOnly; | 163 | BOOL mReadOnly; |
164 | 164 | ||
165 | EVFSValid mValid; | 165 | EVFSValid mValid; |