From b3085debb80db4d8bc4f0376a85afc6d63392559 Mon Sep 17 00:00:00 2001 From: tosh Date: Sun, 19 May 2013 13:22:37 +0200 Subject: [PATCH] further adjusts naming --- libraries/shared/src/UrlReader.cpp | 40 +++++++++++++++--------------- libraries/shared/src/UrlReader.h | 26 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libraries/shared/src/UrlReader.cpp b/libraries/shared/src/UrlReader.cpp index 2e641b5a64..305db63667 100644 --- a/libraries/shared/src/UrlReader.cpp +++ b/libraries/shared/src/UrlReader.cpp @@ -58,10 +58,10 @@ char const* const UrlReader::error_leftover_input = "UrlReader: Incomplete pro #define _curlPtr static_cast(_curlHandle) 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]; - if (! _xtraArray) { _errorStr = error_init_failed; return; } + _xtraBuffer = new(std::nothrow) char[max_read_ahead]; + if (! _xtraBuffer) { _errorStr = error_init_failed; return; } _curlHandle = curl_easy_init(); if (! _curlHandle) { _errorStr = error_init_failed; return; } curl_easy_setopt(_curlPtr, CURLOPT_NOSIGNAL, 1l); @@ -72,8 +72,8 @@ UrlReader::UrlReader() UrlReader::~UrlReader() { - delete[] _xtraArray; - delete[] _cacheRdBufArray; + delete[] _xtraBuffer; + delete[] _cacheReadBuffer; if (! _curlHandle) { return; } @@ -101,8 +101,8 @@ void UrlReader::transferBegin(void* stream, char const* cacheFile) { _errorStr = success; _streamPtr = stream; - _cacheFileStr = cacheFile; - _cacheFilePtr = 0l; + _cacheFileName = cacheFile; + _cacheFile = 0l; _cacheMode = no_cache; _xtraSize = ~size_t(0); } @@ -124,28 +124,28 @@ void UrlReader::getInfo(char const*& url, // printLog("UrlReader: Ready to transfer from URL '%s'\n", url); // check caching file time whether we actually want to download anything - if (_cacheFileStr != 0l) { + if (_cacheFileName != 0l) { struct stat s; - stat(_cacheFileStr, & s); + stat(_cacheFileName, & s); if (time > s.st_mtime) { // file on server is newer -> update cache file - _cacheFilePtr = fopen(_cacheFileStr, "wb"); -// printLog("UrlReader: Also writing content to cache file '%s'\n", _cacheFileStr); - if (_cacheFilePtr != 0l) { + _cacheFile = fopen(_cacheFileName, "wb"); +// printLog("UrlReader: Also writing content to cache file '%s'\n", _cacheFileName); + if (_cacheFile != 0l) { _cacheMode = cache_write; } } else { // file on server is older -> use cache file - if (! _cacheRdBufArray) { - _cacheRdBufArray = new (std::nothrow) char[max_read_ahead]; - if (! _cacheRdBufArray) { + if (! _cacheReadBuffer) { + _cacheReadBuffer = new (std::nothrow) char[max_read_ahead]; + if (! _cacheReadBuffer) { // out of memory, no caching, have CURL catch it return; } } - _cacheFilePtr = fopen(_cacheFileStr, "rb"); -// printLog("UrlReader: Delivering cached content from file '%s'\n", _cacheFileStr); - if (_cacheFilePtr != 0l) { + _cacheFile = fopen(_cacheFileName, "rb"); +// printLog("UrlReader: Delivering cached content from file '%s'\n", _cacheFileName); + if (_cacheFile != 0l) { _cacheMode = cache_read; } // override error code returned by CURL when we abort the download @@ -156,8 +156,8 @@ void UrlReader::getInfo(char const*& url, void UrlReader::transferEnd() { - if (_cacheFilePtr != 0l) { - fclose(_cacheFilePtr); + if (_cacheFile != 0l) { + fclose(_cacheFile); } } diff --git a/libraries/shared/src/UrlReader.h b/libraries/shared/src/UrlReader.h index 9e70555184..8a9084ce32 100644 --- a/libraries/shared/src/UrlReader.h +++ b/libraries/shared/src/UrlReader.h @@ -160,12 +160,12 @@ private: // state void* _curlHandle; - char* _xtraArray; + char* _xtraBuffer; char const* _errorStr; void* _streamPtr; - char const* _cacheFileStr; - FILE* _cacheFilePtr; - char* _cacheRdBufArray; + char const* _cacheFileName; + FILE* _cacheFile; + char* _cacheReadBuffer; CacheMode _cacheMode; 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 size_t fill = max_read_ahead - _xtraSize; if (bytes < fill) fill = bytes; - memcpy(_xtraArray + _xtraSize, buffer, fill); + memcpy(_xtraBuffer + _xtraSize, buffer, fill); // use extra buffer for next transfer - buffer = _xtraArray; + buffer = _xtraBuffer; bytes = _xtraSize + fill; inputOffset += fill; } @@ -238,7 +238,7 @@ size_t UrlReader::feedBuffered(Stream* stream, char* input, size_t size) { size_t unprocessed = bytes - processed; // can switch to input buffer, now? - if (buffer == _xtraArray && unprocessed <= inputOffset) { + if (buffer == _xtraBuffer && unprocessed <= inputOffset) { _xtraSize = 0u; inputOffset -= unprocessed; @@ -251,9 +251,9 @@ size_t UrlReader::feedBuffered(Stream* stream, char* input, size_t size) { return 0; } _xtraSize = unprocessed; - memmove(_xtraArray, buffer + processed, unprocessed); + memmove(_xtraBuffer, buffer + processed, unprocessed); - if (inputOffset == size || buffer != _xtraArray) { + if (inputOffset == size || buffer != _xtraBuffer) { return size; } @@ -287,16 +287,16 @@ size_t UrlReader::callback_template(char *input, size_t size, size_t nmemb, void // read from cache file? if (me->_cacheMode == cache_read) { // change input buffer and start - input = me->_cacheRdBufArray; - size = fread(input, 1, max_read_ahead, me->_cacheFilePtr); + input = me->_cacheReadBuffer; + size = fread(input, 1, max_read_ahead, me->_cacheFile); nmemb = 1; } else if (me->_cacheMode == cache_write) { - fwrite(input, 1, size, me->_cacheFilePtr); + fwrite(input, 1, size, me->_cacheFile); } 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; }