2009-07-14 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Code cleanup
	* src/AbstractCommand.cc
	* src/DownloadCommand.cc

ChangeLog

@@ -1,3 +1,9 @@
+2009-07-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Code cleanup
+	* src/AbstractCommand.cc
+	* src/DownloadCommand.cc
+
 2009-07-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Use option of each download to create AuthConfig instead of global

src/AbstractCommand.cc

@@ -240,7 +240,7 @@ void AbstractCommand::tryReserved() {
     // Don't create new command if currently file length is unknown
     // and there are no URI left. Because file length is unknown, we
     // can assume that there are no in-flight request object.
-    if(entry->getLength() == 0 && entry->getRemainingUris().size() == 0) {
+    if(entry->getLength() == 0 && entry->getRemainingUris().empty()) {
       return;
     }
   }

src/DownloadCommand.cc

@@ -169,32 +169,32 @@ bool DownloadCommand::executeInternal() {
 
   _requestGroup->getSegmentMan()->updateDownloadSpeedFor(peerStat);
 
-  bool segmentComplete = false;
+  bool segmentPartComplete = false;
   // Note that GrowSegment::complete() always returns false.
   if(_transferEncodingDecoder.isNull() && _contentEncodingDecoder.isNull()) {
     if(segment->complete() ||
        segment->getPositionToWrite() == _fileEntry->getLastOffset()) {
-      segmentComplete = true;
+      segmentPartComplete = true;
     } else if(segment->getLength() == 0 && bufSize == 0 &&
 	      !socket->wantRead() && !socket->wantWrite()) {
-      segmentComplete = true;
+      segmentPartComplete = true;
     }
   } else if(!_transferEncodingDecoder.isNull() &&
 	    (segment->complete() || segment->getPositionToWrite() == _fileEntry->getLastOffset())) {
-    segmentComplete = true;
+    segmentPartComplete = true;
   } else if((_transferEncodingDecoder.isNull() ||
 	     _transferEncodingDecoder->finished()) &&
 	    (_contentEncodingDecoder.isNull() ||
 	     _contentEncodingDecoder->finished())) {
-    segmentComplete = true;
+    segmentPartComplete = true;
   }
 
-  if(!segmentComplete && bufSize == 0 &&
+  if(!segmentPartComplete && bufSize == 0 &&
      !socket->wantRead() && !socket->wantWrite()) {
     throw DL_RETRY_EX(EX_GOT_EOF);
   }
 
-  if(segmentComplete) {
+  if(segmentPartComplete) {
     if(segment->complete() || segment->getLength() == 0) {
       // If segment->getLength() == 0, the server doesn't provide
       // content length, but the client detected that download