diff options
| author | Kazuhiro NISHIYAMA <zn@mbf.nifty.com> | 2019-12-17 09:46:45 +0900 |
|---|---|---|
| committer | Kazuhiro NISHIYAMA <znz@users.noreply.github.com> | 2019-12-17 21:56:09 +0900 |
| commit | 299db379575da122bc20745811fc1e20ba01f3ce (patch) | |
| tree | b59998454b77ee1e198f0ceb8c55ce0cbe2544be | |
| parent | 9d3ffcfbfc742ed5053b59678dbf97773a7dddc1 (diff) | |
| download | ruby-299db379575da122bc20745811fc1e20ba01f3ce.tar.gz | |
Use while instead of loop
| -rw-r--r-- | lib/net/ftp.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index b20f84b206..2b7d19a662 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -631,9 +631,7 @@ module Net with_binary(true) do begin conn = transfercmd(cmd, rest_offset) - loop do - data = conn.read(blocksize) - break if data == nil + while data = conn.read(blocksize) yield(data) end conn.shutdown(Socket::SHUT_WR) @@ -658,9 +656,7 @@ module Net with_binary(false) do begin conn = transfercmd(cmd) - loop do - line = conn.gets - break if line == nil + while line = conn.gets yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?) end conn.shutdown(Socket::SHUT_WR) @@ -688,9 +684,7 @@ module Net with_binary(true) do begin conn = transfercmd(cmd) - loop do - buf = file.read(blocksize) - break if buf == nil + while buf = file.read(blocksize) conn.write(buf) yield(buf) if block_given? end @@ -723,9 +717,7 @@ module Net with_binary(false) do begin conn = transfercmd(cmd) - loop do - buf = file.gets - break if buf == nil + while buf = file.gets if buf[-2, 2] != CRLF buf = buf.chomp + CRLF end |