summaryrefslogtreecommitdiff
path: root/src/DownloadEngine.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2008-03-09 12:24:01 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2008-03-09 12:24:01 +0000
commit032c7c28083e17bdcfd763b3cf81447b06a07978 (patch)
treee5cc5ceb050773165df41eb7f0aed3f2a48205a0 /src/DownloadEngine.cc
parentca3f6e57f35c67f67c3b4f64cedded8ca23237e8 (diff)
2008-03-09 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
type cleanup for allmost all remaining files.
Diffstat (limited to 'src/DownloadEngine.cc')
-rw-r--r--src/DownloadEngine.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc
index 43f52ce2..5d6bda08 100644
--- a/src/DownloadEngine.cc
+++ b/src/DownloadEngine.cc
@@ -111,8 +111,8 @@ void DownloadEngine::cleanQueue() {
void DownloadEngine::executeCommand(Command::STATUS statusFilter)
{
- int32_t max = commands.size();
- for(int32_t i = 0; i < max; i++) {
+ size_t max = commands.size();
+ for(size_t i = 0; i < max; i++) {
Command* com = commands.front();
commands.pop_front();
if(com->statusMatch(statusFilter)) {
@@ -160,7 +160,6 @@ void DownloadEngine::shortSleep() const {
void DownloadEngine::waitData() {
fd_set rfds;
fd_set wfds;
- int32_t retval = 0;
struct timeval tv;
memcpy(&rfds, &rfdset, sizeof(fd_set));
@@ -170,7 +169,7 @@ void DownloadEngine::waitData() {
for(NameResolverEntries::iterator itr = nameResolverEntries.begin();
itr != nameResolverEntries.end(); ++itr) {
NameResolverEntry& entry = *itr;
- int32_t fd = entry.nameResolver->getFds(&rfds, &wfds);
+ int fd = entry.nameResolver->getFds(&rfds, &wfds);
// TODO force error if fd == 0
if(fdmax < fd) {
fdmax = fd;
@@ -180,7 +179,7 @@ void DownloadEngine::waitData() {
tv.tv_sec = noWait ? 0 : 1;
tv.tv_usec = 0;
- retval = select(fdmax+1, &rfds, &wfds, NULL, &tv);
+ int retval = select(fdmax+1, &rfds, &wfds, NULL, &tv);
if(retval > 0) {
for(SocketEntries::iterator itr = socketEntries.begin();
itr != socketEntries.end(); ++itr) {
@@ -215,7 +214,7 @@ void DownloadEngine::updateFdSet() {
for(SocketEntries::iterator itr = socketEntries.begin();
itr != socketEntries.end(); ++itr) {
SocketEntry& entry = *itr;
- int32_t fd = entry.socket->getSockfd();
+ int fd = entry.socket->getSockfd();
switch(entry.type) {
case SocketEntry::TYPE_RD:
FD_SET(fd, &rfdset);