Skip to content

Commit 2964e1e

Browse files
tklausergopherbot
tklauser
authored and
gopherbot
committed
unix: remove unused readlen and writelen
These were originally added when copying over files from package syscall. However, their use was removed in CL 129500043. New ports kept adding these wrappers without using them. They are still unused, so remove them. Change-Id: I2ffffe98a5c999d23b63d1f04ee4ad8f807ee736 Reviewed-on: https://go-review.googlesource.com/c/sys/+/531356 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Than McIntosh <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 3186bae commit 2964e1e

35 files changed

+40
-558
lines changed

Diff for: ‎unix/mksyscall.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ func main() {
373373
text += "}\n\n"
374374

375375
if *libc && !trampolines[libcFn] {
376-
// some system calls share a trampoline, like read and readlen.
376+
// Some system calls share a trampoline.
377377
trampolines[libcFn] = true
378378
// Declare assembly trampoline address.
379379
text += fmt.Sprintf("var libc_%s_trampoline_addr uintptr\n\n", libcFn)

Diff for: ‎unix/mksyscall_aix_ppc.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func main() {
217217
}
218218
}
219219

220-
if funct != "fcntl" && funct != "FcntlInt" && funct != "readlen" && funct != "writelen" && funct != "ioctlPtr" {
220+
if funct != "fcntl" && funct != "FcntlInt" && funct != "ioctlPtr" {
221221
if sysname == "select" {
222222
// select is a keyword of Go. Its name is
223223
// changed to c_select.
@@ -296,9 +296,7 @@ func main() {
296296
} else if p.Type == "unsafe.Pointer" {
297297
args = append(args, fmt.Sprintf("C.uintptr_t(uintptr(%s))", p.Name))
298298
} else if p.Type == "int" {
299-
if (argN == 2) && ((funct == "readlen") || (funct == "writelen")) {
300-
args = append(args, fmt.Sprintf("C.size_t(%s)", p.Name))
301-
} else if argN == 0 && funct == "fcntl" {
299+
if argN == 0 && funct == "fcntl" {
302300
args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name))
303301
} else if (argN == 2) && ((funct == "fcntl") || (funct == "FcntlInt")) {
304302
args = append(args, fmt.Sprintf("C.uintptr_t(%s)", p.Name))

Diff for: ‎unix/mksyscall_aix_ppc64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func main() {
189189
}
190190

191191
onlyCommon := false
192-
if funct == "readlen" || funct == "writelen" || funct == "FcntlInt" || funct == "FcntlFlock" || funct == "ioctlPtr" {
192+
if funct == "FcntlInt" || funct == "FcntlFlock" || funct == "ioctlPtr" {
193193
// This function call another syscall which is already implemented.
194194
// Therefore, the gc and gccgo part must not be generated.
195195
onlyCommon = true

Diff for: ‎unix/syscall_aix.go

-2
Original file line numberDiff line numberDiff line change
@@ -487,8 +487,6 @@ func Fsync(fd int) error {
487487
//sys Unlinkat(dirfd int, path string, flags int) (err error)
488488
//sys Ustat(dev int, ubuf *Ustat_t) (err error)
489489
//sys write(fd int, p []byte) (n int, err error)
490-
//sys readlen(fd int, p *byte, np int) (n int, err error) = read
491-
//sys writelen(fd int, p *byte, np int) (n int, err error) = write
492490

493491
//sys Dup2(oldfd int, newfd int) (err error)
494492
//sys Fadvise(fd int, offset int64, length int64, advice int) (err error) = posix_fadvise64

Diff for: ‎unix/syscall_darwin.go

-2
Original file line numberDiff line numberDiff line change
@@ -644,5 +644,3 @@ func SysctlKinfoProcSlice(name string, args ...int) ([]KinfoProc, error) {
644644
//sys write(fd int, p []byte) (n int, err error)
645645
//sys mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
646646
//sys munmap(addr uintptr, length uintptr) (err error)
647-
//sys readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
648-
//sys writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE

Diff for: ‎unix/syscall_dragonfly.go

-2
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,5 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
343343
//sys write(fd int, p []byte) (n int, err error)
344344
//sys mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
345345
//sys munmap(addr uintptr, length uintptr) (err error)
346-
//sys readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
347-
//sys writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
348346
//sys accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
349347
//sys utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)

Diff for: ‎unix/syscall_freebsd.go

-2
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,5 @@ func Dup3(oldfd, newfd, flags int) error {
449449
//sys write(fd int, p []byte) (n int, err error)
450450
//sys mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
451451
//sys munmap(addr uintptr, length uintptr) (err error)
452-
//sys readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
453-
//sys writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
454452
//sys accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
455453
//sys utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)

Diff for: ‎unix/syscall_linux.go

-2
Original file line numberDiff line numberDiff line change
@@ -1979,8 +1979,6 @@ func Signalfd(fd int, sigmask *Sigset_t, flags int) (newfd int, err error) {
19791979
//sys Unshare(flags int) (err error)
19801980
//sys write(fd int, p []byte) (n int, err error)
19811981
//sys exitThread(code int) (err error) = SYS_EXIT
1982-
//sys readlen(fd int, p *byte, np int) (n int, err error) = SYS_READ
1983-
//sys writelen(fd int, p *byte, np int) (n int, err error) = SYS_WRITE
19841982
//sys readv(fd int, iovs []Iovec) (n int, err error) = SYS_READV
19851983
//sys writev(fd int, iovs []Iovec) (n int, err error) = SYS_WRITEV
19861984
//sys preadv(fd int, iovs []Iovec, offs_l uintptr, offs_h uintptr) (n int, err error) = SYS_PREADV

Diff for: ‎unix/syscall_netbsd.go

-2
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
356356
//sys write(fd int, p []byte) (n int, err error)
357357
//sys mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
358358
//sys munmap(addr uintptr, length uintptr) (err error)
359-
//sys readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
360-
//sys writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
361359
//sys utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
362360

363361
const (

Diff for: ‎unix/syscall_openbsd.go

-2
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,4 @@ func Uname(uname *Utsname) error {
326326
//sys write(fd int, p []byte) (n int, err error)
327327
//sys mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
328328
//sys munmap(addr uintptr, length uintptr) (err error)
329-
//sys readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
330-
//sys writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
331329
//sys utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)

Diff for: ‎unix/syscall_solaris.go

-18
Original file line numberDiff line numberDiff line change
@@ -698,24 +698,6 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
698698
//sys setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
699699
//sys recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
700700

701-
func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
702-
r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procread)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
703-
n = int(r0)
704-
if e1 != 0 {
705-
err = e1
706-
}
707-
return
708-
}
709-
710-
func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
711-
r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procwrite)), 3, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf), 0, 0, 0)
712-
n = int(r0)
713-
if e1 != 0 {
714-
err = e1
715-
}
716-
return
717-
}
718-
719701
// Event Ports
720702

721703
type fileObjCookie struct {

Diff for: ‎unix/syscall_zos_s390x.go

-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ func (cmsg *Cmsghdr) SetLen(length int) {
192192

193193
//sys fcntl(fd int, cmd int, arg int) (val int, err error)
194194
//sys read(fd int, p []byte) (n int, err error)
195-
//sys readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
196195
//sys write(fd int, p []byte) (n int, err error)
197196

198197
//sys accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) = SYS___ACCEPT_A

Diff for: ‎unix/zsyscall_aix_ppc.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_aix_ppc64.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_darwin_amd64.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_darwin_arm64.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_dragonfly_amd64.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_freebsd_386.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_freebsd_amd64.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_freebsd_arm.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎unix/zsyscall_freebsd_arm64.go

-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)