Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

improves naming consistency (mostly member variable prefixes)

Browse source
This commit is contained in:
tosh 2013-03-27 11:53:01 +01:00
parent ecd64d3244
commit 5bb55f7fc4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shared/src/UrlReader.cpp
View file

@ -23,10 +23,10 @@ char const* const UrlReader::error_leftover_input = "UrlReader: Incomplete pro
#define hnd_curl static_cast<CURL*>(ptr_impl)
UrlReader::UrlReader()
: ptr_impl(0l), buf_xtra(0l), str_error(0l)
: ptr_impl(0l), arr_xtra(0l), str_error(0l)
{
buf_xtra = new(std::nothrow) char[max_read_ahead];
if (! buf_xtra) { str_error = error_init_failed; return; }
arr_xtra = new(std::nothrow) char[max_read_ahead];
if (! arr_xtra) { str_error = error_init_failed; return; }
ptr_impl = curl_easy_init();
if (! ptr_impl) { str_error = error_init_failed; return; }
curl_easy_setopt(hnd_curl, CURLOPT_NOSIGNAL, 1l);
@ -36,7 +36,7 @@ UrlReader::UrlReader()
UrlReader::~UrlReader()
{
delete buf_xtra;
delete arr_xtra;
if (! hnd_curl) return;
curl_easy_cleanup(hnd_curl);
}

12
shared/src/UrlReader.h
View file

@ -20,7 +20,7 @@
class UrlReader
{
void* ptr_impl;
char* buf_xtra;
char* arr_xtra;
char const* str_error;
void* ptr_stream;
size_t val_xtra_size_size;
@ -201,9 +201,9 @@ size_t UrlReader::callback_template(
// fill extra buffer with beginning of input
size_t fill = max_read_ahead - me->val_xtra_size_size;
if (bytes < fill) fill = bytes;
memcpy(me->buf_xtra + me->val_xtra_size_size, buffer, fill);
memcpy(me->arr_xtra + me->val_xtra_size_size, buffer, fill);
// use extra buffer for next transfer
buffer = me->buf_xtra;
buffer = me->arr_xtra;
bytes = me->val_xtra_size_size + fill;
input_offset += fill;
}
@ -223,7 +223,7 @@ size_t UrlReader::callback_template(
size_t unprocessed = bytes - processed;
// can switch to input buffer, now?
if (buffer == me->buf_xtra && unprocessed <= input_offset)
if (buffer == me->arr_xtra && unprocessed <= input_offset)
{
me->val_xtra_size_size = 0u;
input_offset -= unprocessed;
@ -236,9 +236,9 @@ size_t UrlReader::callback_template(
return 0;
}
me->val_xtra_size_size = unprocessed;
memmove(me->buf_xtra, buffer + processed, unprocessed);
memmove(me->arr_xtra, buffer + processed, unprocessed);
if (input_offset == size || buffer != me->buf_xtra)
if (input_offset == size || buffer != me->arr_xtra)
{
return size;
}