sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reformatting code using Kernighan & Ritchie style, tabs, tab width=4.

Browse Source 
Command line: astyle --style=kr --indent=force-tab=4 --lineend=linux -n -r <file names>
This commit is contained in:
lotodore
2011-02-11 20:02:08 +00:00
parent 29dca1846e
commit 02518c67b2
232 changed files with 22743 additions and 21044 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/downloaderthread.cpp
+10 -20
View File
@@ -33,7 +33,7 @@ using namespace boost::filesystem;
DownloaderThread::DownloaderThread()
: m_downloadInProgress(false)
: m_downloadInProgress(false)
{
m_downloadHelper.reset(new DownloadHelper());
}
@@ -61,8 +61,7 @@ DownloaderThread::GetDownloadResult(unsigned &downloadId, std::vector<unsigned c
{
bool result = false;
boost::mutex::scoped_lock lock(m_downloadDoneQueueMutex);
if (!m_downloadDoneQueue.empty())
{
if (!m_downloadDoneQueue.empty()) {
const ResultData &d = m_downloadDoneQueue.front();
downloadId = d.id;
filedata = d.data;
@@ -75,20 +74,15 @@ DownloaderThread::GetDownloadResult(unsigned &downloadId, std::vector<unsigned c
void
DownloaderThread::Main()
{
while (!ShouldTerminate())
{
try
{
if (m_downloadInProgress)
{
while (!ShouldTerminate()) {
try {
if (m_downloadInProgress) {
m_downloadInProgress = !m_downloadHelper->Process();
}
if (!m_downloadInProgress)
{
if (!m_downloadInProgress) {
// Previous download was finished.
if (m_curDownloadData)
{
if (m_curDownloadData) {
path filepath(m_curDownloadData->filename);
ifstream instream(filepath.file_string().c_str(), ios_base::in | ios_base::binary);
// Find out file size.
@@ -119,22 +113,18 @@ DownloaderThread::Main()
// Start next download.
{
boost::mutex::scoped_lock lock(m_downloadQueueMutex);
if (!m_downloadQueue.empty())
{
if (!m_downloadQueue.empty()) {
m_curDownloadData.reset(new DownloadData(m_downloadQueue.front()));
m_downloadQueue.pop();
}
}
if (m_curDownloadData && !m_curDownloadData->filename.empty())
{
if (m_curDownloadData && !m_curDownloadData->filename.empty()) {
path filepath(m_curDownloadData->filename);
m_downloadHelper->Init(m_curDownloadData->address, filepath.file_string());
m_downloadInProgress = true;
}
}
}
catch (const NetException &e)
{
} catch (const NetException &e) {
LOG_ERROR("Download failed: " << e.what());
m_downloadInProgress = false;
m_curDownloadData.reset();