diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llapr.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h index a5c217c..be6fc6c 100644 --- a/linden/indra/llcommon/llapr.h +++ b/linden/indra/llcommon/llapr.h | |||
@@ -125,14 +125,24 @@ typedef LLAtomic32<S32> LLAtomicS32; | |||
125 | #define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb" | 125 | #define LL_APR_WB (APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY) // "wb" |
126 | #define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b" | 126 | #define LL_APR_RPB (APR_READ|APR_WRITE|APR_BINARY) // "r+b" |
127 | #define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b" | 127 | #define LL_APR_WPB (APR_CREATE|APR_TRUNCATE|APR_READ|APR_WRITE|APR_BINARY) // "w+b" |
128 | apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep = NULL); | 128 | apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep, apr_pool_t* pool); |
129 | apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, S32* sizep); | ||
130 | apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags, apr_pool_t* pool); | ||
131 | apr_file_t* ll_apr_file_open(const LLString& filename, apr_int32_t flags); | ||
129 | // Returns actual offset, -1 if seek fails | 132 | // Returns actual offset, -1 if seek fails |
130 | S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset); | 133 | S32 ll_apr_file_seek(apr_file_t* apr_file, apr_seek_where_t where, S32 offset); |
131 | // Returns bytes read/written, 0 if read/write fails | 134 | // Returns bytes read/written, 0 if read/write fails: |
132 | S32 ll_apr_file_read(apr_file_t* apr_file, void* buf, S32 nbytes); | 135 | S32 ll_apr_file_read(apr_file_t* apr_file, void* buf, S32 nbytes); |
136 | S32 ll_apr_file_read_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes); | ||
133 | S32 ll_apr_file_write(apr_file_t* apr_file, const void* buf, S32 nbytes); | 137 | S32 ll_apr_file_write(apr_file_t* apr_file, const void* buf, S32 nbytes); |
134 | bool ll_apr_file_remove(const LLString& filename); | 138 | S32 ll_apr_file_write_ex(const LLString& filename, apr_pool_t* pool, void *buf, S32 offset, S32 nbytes); |
135 | bool ll_apr_file_rename(const LLString& filename, const LLString& newname); | 139 | // returns false if failure: |
140 | bool ll_apr_file_remove(const LLString& filename, apr_pool_t* pool = NULL); | ||
141 | bool ll_apr_file_rename(const LLString& filename, const LLString& newname, apr_pool_t* pool = NULL); | ||
142 | bool ll_apr_file_exists(const LLString& filename, apr_pool_t* pool = NULL); | ||
143 | S32 ll_apr_file_size(const LLString& filename, apr_pool_t* pool = NULL); | ||
144 | bool ll_apr_dir_make(const LLString& dirname, apr_pool_t* pool = NULL); | ||
145 | bool ll_apr_dir_remove(const LLString& dirname, apr_pool_t* pool = NULL); | ||
136 | 146 | ||
137 | /** | 147 | /** |
138 | * @brief Function which approprately logs error or remains quiet on | 148 | * @brief Function which approprately logs error or remains quiet on |