Skip to content

Commit cff53d5

Browse files
dmitshurgopherbot
authored andcommitted
unix: gofmt after CL 610296
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]>
1 parent 123459f commit cff53d5

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

Diff for: unix/syscall_zos_s390x.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,6 @@ func MunmapPtr(addr unsafe.Pointer, length uintptr) (err error) {
777777
return mapper.munmap(uintptr(addr), length)
778778
}
779779

780-
781780
//sys Gethostname(buf []byte) (err error) = SYS___GETHOSTNAME_A
782781
//sysnb Getgid() (gid int)
783782
//sysnb Getpid() (pid int)
@@ -3142,7 +3141,7 @@ func Fcntl(fd uintptr, cmd int, op interface{}) (ret int, err error) {
31423141
case *Flock_t:
31433142
err = FcntlFlock(fd, cmd, op.(*Flock_t))
31443143
if err != nil {
3145-
ret = -1
3144+
ret = -1
31463145
}
31473146
return
31483147
case int:

Diff for: unix/syscall_zos_test.go

-4
Original file line numberDiff line numberDiff line change
@@ -3844,9 +3844,7 @@ func TestTty(t *testing.T) {
38443844
t.Fatalf("Open %s %+v\n", sname, err)
38453845
}
38463846
if _, err = unix.Fcntl(uintptr(ptsfd), unix.F_CONTROL_CVT, &cvtreq); err != nil {
3847-
38483847
t.Fatalf("fcntl F_CONTROL_CVT ptsfd %+v\n", err)
3849-
38503848
}
38513849

38523850
tt := os.NewFile(uintptr(ptsfd), sname)
@@ -3871,7 +3869,5 @@ func TestTty(t *testing.T) {
38713869

38723870
if !bytes.Equal(text, buffer[:n]) {
38733871
t.Fatalf("Expected %+v, read %+v\n", text, buffer[:n])
3874-
38753872
}
3876-
38773873
}

Diff for: unix/ztypes_zos_s390x.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,9 @@ type Flock_t struct {
378378
}
379379

380380
type F_cnvrt struct {
381-
Cvtcmd int32
382-
Pccsid int16
383-
Fccsid int16
381+
Cvtcmd int32
382+
Pccsid int16
383+
Fccsid int16
384384
}
385385

386386
type Termios struct {

0 commit comments

Comments
 (0)