diff --git a/unix/syscall_zos_s390x.go b/unix/syscall_zos_s390x.go index cca890876..44db49e31 100644 --- a/unix/syscall_zos_s390x.go +++ b/unix/syscall_zos_s390x.go @@ -777,7 +777,6 @@ func MunmapPtr(addr unsafe.Pointer, length uintptr) (err error) { return mapper.munmap(uintptr(addr), length) } - //sys Gethostname(buf []byte) (err error) = SYS___GETHOSTNAME_A //sysnb Getgid() (gid int) //sysnb Getpid() (pid int) @@ -3142,7 +3141,7 @@ func Fcntl(fd uintptr, cmd int, op interface{}) (ret int, err error) { case *Flock_t: err = FcntlFlock(fd, cmd, op.(*Flock_t)) if err != nil { - ret = -1 + ret = -1 } return case int: diff --git a/unix/syscall_zos_test.go b/unix/syscall_zos_test.go index e496893e3..a77d60e91 100644 --- a/unix/syscall_zos_test.go +++ b/unix/syscall_zos_test.go @@ -3844,9 +3844,7 @@ func TestTty(t *testing.T) { t.Fatalf("Open %s %+v\n", sname, err) } if _, err = unix.Fcntl(uintptr(ptsfd), unix.F_CONTROL_CVT, &cvtreq); err != nil { - t.Fatalf("fcntl F_CONTROL_CVT ptsfd %+v\n", err) - } tt := os.NewFile(uintptr(ptsfd), sname) @@ -3871,7 +3869,5 @@ func TestTty(t *testing.T) { if !bytes.Equal(text, buffer[:n]) { t.Fatalf("Expected %+v, read %+v\n", text, buffer[:n]) - } - } diff --git a/unix/ztypes_zos_s390x.go b/unix/ztypes_zos_s390x.go index 8c4d053e8..2e5d5a443 100644 --- a/unix/ztypes_zos_s390x.go +++ b/unix/ztypes_zos_s390x.go @@ -378,9 +378,9 @@ type Flock_t struct { } type F_cnvrt struct { - Cvtcmd int32 - Pccsid int16 - Fccsid int16 + Cvtcmd int32 + Pccsid int16 + Fccsid int16 } type Termios struct {