summaryrefslogtreecommitdiffstats
path: root/net/ftp
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 23:36:38 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 23:36:38 +0000
commit0e2a12d33776619983dd366daa41ceb6711d10bc (patch)
tree60514e72ce040c8a242a7c3be378a35def7e4422 /net/ftp
parent52a933cefefb3e83e296d417be832fc420e41c12 (diff)
downloadchromium_src-0e2a12d33776619983dd366daa41ceb6711d10bc.zip
chromium_src-0e2a12d33776619983dd366daa41ceb6711d10bc.tar.gz
chromium_src-0e2a12d33776619983dd366daa41ceb6711d10bc.tar.bz2
Add a missing Stop() call to DoDataResolveHostComplete().
Fix some minor nits. The patch is contributed by Ibrar Ahmed <ibrar.ahmad@gmail.com>. Original review URL: http://codereview.chromium.org/164330 R=wtc BUG=http://crbug.com/4965 TEST=none Review URL: http://codereview.chromium.org/165496 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ftp')
-rw-r--r--net/ftp/ftp_network_transaction.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index ee373be..b5b06fe 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -128,7 +128,7 @@ uint64 FtpNetworkTransaction::GetUploadProgress() const {
return 0;
}
-// Used to prepare and send FTP commad.
+// Used to prepare and send FTP command.
int FtpNetworkTransaction::SendFtpCommand(const std::string& command,
Command cmd) {
// If we send a new command when we still have unprocessed responses
@@ -911,7 +911,7 @@ int FtpNetworkTransaction::ProcessResponseLIST(
return OK;
}
-// Quit command
+// QUIT command
int FtpNetworkTransaction::DoCtrlWriteQUIT() {
std::string command = "QUIT";
next_state_ = STATE_CTRL_READ;
@@ -939,9 +939,11 @@ int FtpNetworkTransaction::DoDataResolveHost() {
}
int FtpNetworkTransaction::DoDataResolveHostComplete(int result) {
- if (result == OK)
+ if (result == OK) {
next_state_ = STATE_DATA_CONNECT;
- return result;
+ return result;
+ }
+ return Stop(result);
}
int FtpNetworkTransaction::DoDataConnect() {