kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Use while instead of loop

Browse source
This commit is contained in:
Kazuhiro NISHIYAMA 2019-12-17 09:46:45 +09:00 committed by Kazuhiro NISHIYAMA
parent 9d3ffcfbfc
commit 299db37957
Notes: git 2019-12-17 21:56:34 +09:00 
Merged: https://github.com/ruby/ruby/pull/2758
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/net/ftp.rb
View file

@ -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