Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:29:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

further adjusts naming

Browse source
This commit is contained in:
tosh 2013-05-19 13:22:37 +02:00
parent de665c2d48
commit b3085debb8
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libraries/shared/src/UrlReader.cpp
View file

@ -58,10 +58,10 @@ char const* const UrlReader::error_leftover_input = "UrlReader: Incomplete pro
#define _curlPtr static_cast<CURL*>(_curlHandle) #define _curlPtr static_cast<CURL*>(_curlHandle)
UrlReader::UrlReader() UrlReader::UrlReader()
: _curlHandle(0l), _xtraArray(0l), _errorStr(0l), _cacheRdBufArray(0l) { : _curlHandle(0l), _xtraBuffer(0l), _errorStr(0l), _cacheReadBuffer(0l) {
_xtraArray = new(std::nothrow) char[max_read_ahead]; _xtraBuffer = new(std::nothrow) char[max_read_ahead];
if (! _xtraArray) { _errorStr = error_init_failed; return; } if (! _xtraBuffer) { _errorStr = error_init_failed; return; }
_curlHandle = curl_easy_init(); _curlHandle = curl_easy_init();
if (! _curlHandle) { _errorStr = error_init_failed; return; } if (! _curlHandle) { _errorStr = error_init_failed; return; }
curl_easy_setopt(_curlPtr, CURLOPT_NOSIGNAL, 1l); curl_easy_setopt(_curlPtr, CURLOPT_NOSIGNAL, 1l);
@ -72,8 +72,8 @@ UrlReader::UrlReader()
UrlReader::~UrlReader() { UrlReader::~UrlReader() {
delete[] _xtraArray; delete[] _xtraBuffer;
delete[] _cacheRdBufArray; delete[] _cacheReadBuffer;
if (! _curlHandle) { if (! _curlHandle) {
return; return;
} }
@ -101,8 +101,8 @@ void UrlReader::transferBegin(void* stream, char const* cacheFile) {
_errorStr = success; _errorStr = success;
_streamPtr = stream; _streamPtr = stream;
_cacheFileStr = cacheFile; _cacheFileName = cacheFile;
_cacheFilePtr = 0l; _cacheFile = 0l;
_cacheMode = no_cache; _cacheMode = no_cache;
_xtraSize = ~size_t(0); _xtraSize = ~size_t(0);
} }
@ -124,28 +124,28 @@ void UrlReader::getInfo(char const*& url,
// printLog("UrlReader: Ready to transfer from URL '%s'\n", url); // printLog("UrlReader: Ready to transfer from URL '%s'\n", url);
// check caching file time whether we actually want to download anything // check caching file time whether we actually want to download anything
if (_cacheFileStr != 0l) { if (_cacheFileName != 0l) {
struct stat s; struct stat s;
stat(_cacheFileStr, & s); stat(_cacheFileName, & s);
if (time > s.st_mtime) { if (time > s.st_mtime) {
// file on server is newer -> update cache file // file on server is newer -> update cache file
_cacheFilePtr = fopen(_cacheFileStr, "wb"); _cacheFile = fopen(_cacheFileName, "wb");
// printLog("UrlReader: Also writing content to cache file '%s'\n", _cacheFileStr); // printLog("UrlReader: Also writing content to cache file '%s'\n", _cacheFileName);
if (_cacheFilePtr != 0l) { if (_cacheFile != 0l) {
_cacheMode = cache_write; _cacheMode = cache_write;
} }
} else { } else {
// file on server is older -> use cache file // file on server is older -> use cache file
if (! _cacheRdBufArray) { if (! _cacheReadBuffer) {
_cacheRdBufArray = new (std::nothrow) char[max_read_ahead]; _cacheReadBuffer = new (std::nothrow) char[max_read_ahead];
if (! _cacheRdBufArray) { if (! _cacheReadBuffer) {
// out of memory, no caching, have CURL catch it // out of memory, no caching, have CURL catch it
return; return;
} }
} }
_cacheFilePtr = fopen(_cacheFileStr, "rb"); _cacheFile = fopen(_cacheFileName, "rb");
// printLog("UrlReader: Delivering cached content from file '%s'\n", _cacheFileStr); // printLog("UrlReader: Delivering cached content from file '%s'\n", _cacheFileName);
if (_cacheFilePtr != 0l) { if (_cacheFile != 0l) {
_cacheMode = cache_read; _cacheMode = cache_read;
} }
// override error code returned by CURL when we abort the download // override error code returned by CURL when we abort the download
@ -156,8 +156,8 @@ void UrlReader::getInfo(char const*& url,
void UrlReader::transferEnd() { void UrlReader::transferEnd() {
if (_cacheFilePtr != 0l) { if (_cacheFile != 0l) {
fclose(_cacheFilePtr); fclose(_cacheFile);
} }
} }

26
libraries/shared/src/UrlReader.h
View file

@ -160,12 +160,12 @@ private:
// state // state
void* _curlHandle; void* _curlHandle;
char* _xtraArray; char* _xtraBuffer;
char const* _errorStr; char const* _errorStr;
void* _streamPtr; void* _streamPtr;
char const* _cacheFileStr; char const* _cacheFileName;
FILE* _cacheFilePtr; FILE* _cacheFile;
char* _cacheRdBufArray; char* _cacheReadBuffer;
CacheMode _cacheMode; CacheMode _cacheMode;
size_t _xtraSize; size_t _xtraSize;
}; };
@ -216,9 +216,9 @@ size_t UrlReader::feedBuffered(Stream* stream, char* input, size_t size) {
// fill extra buffer with beginning of input // fill extra buffer with beginning of input
size_t fill = max_read_ahead - _xtraSize; size_t fill = max_read_ahead - _xtraSize;
if (bytes < fill) fill = bytes; if (bytes < fill) fill = bytes;
memcpy(_xtraArray + _xtraSize, buffer, fill); memcpy(_xtraBuffer + _xtraSize, buffer, fill);
// use extra buffer for next transfer // use extra buffer for next transfer
buffer = _xtraArray; buffer = _xtraBuffer;
bytes = _xtraSize + fill; bytes = _xtraSize + fill;
inputOffset += fill; inputOffset += fill;
} }
@ -238,7 +238,7 @@ size_t UrlReader::feedBuffered(Stream* stream, char* input, size_t size) {
size_t unprocessed = bytes - processed; size_t unprocessed = bytes - processed;
// can switch to input buffer, now? // can switch to input buffer, now?
if (buffer == _xtraArray && unprocessed <= inputOffset) { if (buffer == _xtraBuffer && unprocessed <= inputOffset) {
_xtraSize = 0u; _xtraSize = 0u;
inputOffset -= unprocessed; inputOffset -= unprocessed;
@ -251,9 +251,9 @@ size_t UrlReader::feedBuffered(Stream* stream, char* input, size_t size) {
return 0; return 0;
} }
_xtraSize = unprocessed; _xtraSize = unprocessed;
memmove(_xtraArray, buffer + processed, unprocessed); memmove(_xtraBuffer, buffer + processed, unprocessed);
if (inputOffset == size || buffer != _xtraArray) { if (inputOffset == size || buffer != _xtraBuffer) {
return size; return size;
} }
@ -287,16 +287,16 @@ size_t UrlReader::callback_template(char *input, size_t size, size_t nmemb, void
// read from cache file? // read from cache file?
if (me->_cacheMode == cache_read) { if (me->_cacheMode == cache_read) {
// change input buffer and start // change input buffer and start
input = me->_cacheRdBufArray; input = me->_cacheReadBuffer;
size = fread(input, 1, max_read_ahead, me->_cacheFilePtr); size = fread(input, 1, max_read_ahead, me->_cacheFile);
nmemb = 1; nmemb = 1;
} else if (me->_cacheMode == cache_write) { } else if (me->_cacheMode == cache_write) {
fwrite(input, 1, size, me->_cacheFilePtr); fwrite(input, 1, size, me->_cacheFile);
} }
result = me->feedBuffered(stream, input, size); result = me->feedBuffered(stream, input, size);
} while (me->_cacheMode == cache_read && result != 0 && ! feof(me->_cacheFilePtr)); } while (me->_cacheMode == cache_read && result != 0 && ! feof(me->_cacheFile));
return me->_cacheMode != cache_read ? result : 0; return me->_cacheMode != cache_read ? result : 0;
} }