mirror of
https://github.com/golang/sys.git
synced 2026-02-07 19:26:03 +03:00
unix: drop incorrect Fsetxattr size return value
Fsetxattr should just return an error (like Setxattr and like Fsetxattr is already doing on FreeBSD). Fix for CL 128176 Updates golang/go#26832 Change-Id: Id1c1315d9eb6952128e0c0ce44b19060e0403cc0 Reviewed-on: https://go-review.googlesource.com/128495 Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
committed by
Tobias Klauser
parent
f62c962c3e
commit
3249cb6984
@@ -1292,7 +1292,7 @@ func Mount(source string, target string, fstype string, flags uintptr, data stri
|
||||
//sys Flistxattr(fd int, dest []byte) (sz int, err error)
|
||||
//sys Flock(fd int, how int) (err error)
|
||||
//sys Fremovexattr(fd int, attr string) (err error)
|
||||
//sys Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
//sys Fsetxattr(fd int, attr string, dest []byte, flags int) (err error)
|
||||
//sys Fsync(fd int) (err error)
|
||||
//sys Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64
|
||||
//sysnb Getpgid(pid int) (pgid int, err error)
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
@@ -638,7 +638,7 @@ func Fremovexattr(fd int, attr string) (err error) {
|
||||
|
||||
// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
|
||||
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error) {
|
||||
func Fsetxattr(fd int, attr string, dest []byte, flags int) (err error) {
|
||||
var _p0 *byte
|
||||
_p0, err = BytePtrFromString(attr)
|
||||
if err != nil {
|
||||
@@ -650,8 +650,7 @@ func Fsetxattr(fd int, attr string, dest []byte, flags int) (sz int, err error)
|
||||
} else {
|
||||
_p1 = unsafe.Pointer(&_zero)
|
||||
}
|
||||
r0, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
sz = int(r0)
|
||||
_, _, e1 := Syscall6(SYS_FSETXATTR, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)), uintptr(flags), 0)
|
||||
if e1 != 0 {
|
||||
err = errnoErr(e1)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user