1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

fmt: remove space in front of ? and ! (#14366)

This commit is contained in:
Daniel Däschle
2022-05-13 05:56:21 +02:00
committed by GitHub
parent df029da942
commit d679146a80
324 changed files with 1865 additions and 1879 deletions

View File

@ -82,7 +82,7 @@ fn (mut zftp FTP) write(data string) ?int {
}
fn (mut zftp FTP) read() ?(int, string) {
mut data := zftp.reader.read_line() ?
mut data := zftp.reader.read_line()?
$if debug {
println('FTP.v <<< $data')
}
@ -92,7 +92,7 @@ fn (mut zftp FTP) read() ?(int, string) {
code := data[..3].int()
if data[3] == `-` {
for {
data = zftp.reader.read_line() ?
data = zftp.reader.read_line()?
if data[..3].int() == code && data[3] != `-` {
break
}
@ -102,9 +102,9 @@ fn (mut zftp FTP) read() ?(int, string) {
}
pub fn (mut zftp FTP) connect(ip string) ?bool {
zftp.conn = net.dial_tcp('$ip:21') ?
zftp.conn = net.dial_tcp('$ip:21')?
zftp.reader = io.new_buffered_reader(reader: zftp.conn)
code, _ := zftp.read() ?
code, _ := zftp.read()?
if code == ftp.connected {
return true
}
@ -118,7 +118,7 @@ pub fn (mut zftp FTP) login(user string, passwd string) ?bool {
}
return false
}
mut code, _ := zftp.read() ?
mut code, _ := zftp.read()?
if code == ftp.logged_in {
return true
}
@ -131,7 +131,7 @@ pub fn (mut zftp FTP) login(user string, passwd string) ?bool {
}
return false
}
code, _ = zftp.read() ?
code, _ = zftp.read()?
if code == ftp.logged_in {
return true
}
@ -139,13 +139,13 @@ pub fn (mut zftp FTP) login(user string, passwd string) ?bool {
}
pub fn (mut zftp FTP) close() ? {
zftp.write('QUIT') ?
zftp.conn.close() ?
zftp.write('QUIT')?
zftp.conn.close()?
}
pub fn (mut zftp FTP) pwd() ?string {
zftp.write('PWD') ?
_, data := zftp.read() ?
zftp.write('PWD')?
_, data := zftp.read()?
spl := data.split('"') // "
if spl.len >= 2 {
return spl[1]
@ -155,7 +155,7 @@ pub fn (mut zftp FTP) pwd() ?string {
pub fn (mut zftp FTP) cd(dir string) ? {
zftp.write('CWD $dir') or { return }
mut code, mut data := zftp.read() ?
mut code, mut data := zftp.read()?
match int(code) {
ftp.denied {
$if debug {
@ -163,7 +163,7 @@ pub fn (mut zftp FTP) cd(dir string) ? {
}
}
ftp.complete {
code, data = zftp.read() ?
code, data = zftp.read()?
}
else {}
}
@ -189,30 +189,30 @@ fn new_dtp(msg string) ?&DTP {
}
fn (mut zftp FTP) pasv() ?&DTP {
zftp.write('PASV') ?
code, data := zftp.read() ?
zftp.write('PASV')?
code, data := zftp.read()?
$if debug {
println('pass: $data')
}
if code != ftp.passive_mode {
return error('pasive mode not allowed')
}
dtp := new_dtp(data) ?
dtp := new_dtp(data)?
return dtp
}
pub fn (mut zftp FTP) dir() ?[]string {
mut dtp := zftp.pasv() or { return error('Cannot establish data connection') }
zftp.write('LIST') ?
code, _ := zftp.read() ?
zftp.write('LIST')?
code, _ := zftp.read()?
if code == ftp.denied {
return error('`LIST` denied')
}
if code != ftp.open_data_connection {
return error('Data channel empty')
}
list_dir := dtp.read() ?
result, _ := zftp.read() ?
list_dir := dtp.read()?
result, _ := zftp.read()?
if result != ftp.close_data_connection {
println('`LIST` not ok')
}
@ -229,15 +229,15 @@ pub fn (mut zftp FTP) dir() ?[]string {
pub fn (mut zftp FTP) get(file string) ?[]u8 {
mut dtp := zftp.pasv() or { return error('Cannot stablish data connection') }
zftp.write('RETR $file') ?
code, _ := zftp.read() ?
zftp.write('RETR $file')?
code, _ := zftp.read()?
if code == ftp.denied {
return error('Permission denied')
}
if code != ftp.open_data_connection {
return error('Data connection not ready')
}
blob := dtp.read() ?
blob := dtp.read()?
dtp.close()
return blob
}