Skip to content

Commit

Permalink
unix: gofmt after CL 610296
Browse files Browse the repository at this point in the history
Also remove a few unhelpful blank lines.

Change-Id: I4001a25ec409406855b7800afd88738c43f60b90
Reviewed-on: https://go-review.googlesource.com/c/sys/+/621921
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Ian Lance Taylor <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>
  • Loading branch information
dmitshur authored and gopherbot committed Oct 25, 2024
1 parent 123459f commit cff53d5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
3 changes: 1 addition & 2 deletions unix/syscall_zos_s390x.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 0 additions & 4 deletions unix/syscall_zos_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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])

}

}
6 changes: 3 additions & 3 deletions unix/ztypes_zos_s390x.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit cff53d5

Please sign in to comment.