diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-09 15:43:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-09 18:44:03 +0300 |
| commit | e5726a11424ebd48f12d76149ec7e5e2b6278bdd (patch) | |
| tree | bdcb9987f4109513a99f3a46e01687babc94a243 /src/net | |
| parent | b4bdf86b6dd57045bd2d80cfcd5e0a428a5054b3 (diff) | |
| download | manaplus-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.gz manaplus-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.bz2 manaplus-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.tar.xz manaplus-e5726a11424ebd48f12d76149ec7e5e2b6278bdd.zip | |
Fix code style.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/download.cpp | 10 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 1 | ||||
| -rw-r--r-- | src/net/logindata.h | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/net/download.cpp b/src/net/download.cpp index 6d13be8bf..4a9cbf0ea 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -310,7 +310,8 @@ int Download::downloadThread(void *ptr) { logger->log_r("Downloading: %s", d->mUrl.c_str()); curl_easy_setopt(d->mCurl, CURLOPT_FOLLOWLOCATION, 1); - curl_easy_setopt(d->mCurl, CURLOPT_HTTPHEADER, d->mHeaders); + curl_easy_setopt(d->mCurl, CURLOPT_HTTPHEADER, + d->mHeaders); if (d->mOptions.memoryWrite) { curl_easy_setopt(d->mCurl, CURLOPT_FAILONERROR, 1); @@ -322,7 +323,10 @@ int Download::downloadThread(void *ptr) { file = fopen(outFilename.c_str(), "w+b"); if (file) - curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, file); + { + curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, + file); + } } curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT, strprintf(PACKAGE_EXTENDED_VERSION, @@ -418,7 +422,7 @@ int Download::downloadThread(void *ptr) d->mFileName.c_str(), adler, d->mAdler); attempts++; - continue; // Bail out here to avoid the renaming + continue; } } diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index eacb98711..2f5ec35ce 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -34,7 +34,6 @@ #include "utils/delete2.h" #include "listeners/arrowslistener.h" -#include "listeners/updatestatuslistener.h" #include "debug.h" diff --git a/src/net/logindata.h b/src/net/logindata.h index f1660a64d..a2179a0b9 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -23,10 +23,14 @@ #ifndef NET_LOGINDATA_H #define NET_LOGINDATA_H -#include "being/being.h" +#include "being/gender.h" + +#include "utils/stringvector.h" #include <string> +#include "localconsts.h" + class LoginData final { public: |