From 06e67265374faa677dba2dbd2577054278f19823 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 16 Dec 2015 19:17:46 +0100 Subject: sys: fix typos --- sys/decl.go | 9 +++++++-- sys/sys.go | 2 +- sys/sys.txt | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/decl.go b/sys/decl.go index c591c65fb..60c076d8a 100644 --- a/sys/decl.go +++ b/sys/decl.go @@ -361,7 +361,10 @@ type ArrayType struct { } func (t ArrayType) Size() uintptr { - return 0 // for trailing embed arrays + if t.Len == 0 { + return 0 // for trailing embed arrays + } + return t.Len * t.Type.Size() } func (t ArrayType) Align() uintptr { @@ -481,7 +484,9 @@ func addAlignment(t StructType) Type { } off += f.Size() fields = append(fields, f) - _, varLen := f.(ArrayType) + if at, ok := f.(ArrayType); ok && at.Len == 0 { + varLen = true + } if varLen && i != len(t.Fields)-1 { panic("embed array in middle of a struct") } diff --git a/sys/sys.go b/sys/sys.go index a6be6312b..b6dac187f 100644 --- a/sys/sys.go +++ b/sys/sys.go @@ -1813,7 +1813,7 @@ func initCalls() { Calls = append(Calls, &Call{ID: 603, Name: "ioctl$HIDPCONNADD", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdBtHidp}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1074022600)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "hidp_connadd_req", IsOptional: false}, Fields: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "ctrlsk", IsOptional: false}, Kind: ResFD, Subkind: ResAny}, ResourceType{TypeCommon: TypeCommon{TypeName: "intrsk", IsOptional: false}, Kind: ResFD, Subkind: ResAny}, IntType{TypeCommon: TypeCommon{TypeName: "parser", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "rdsize", IsOptional: false}, TypeSize: 2}, PtrType{TypeCommon: TypeCommon{TypeName: "rddata", IsOptional: false}, Dir: DirIn, Type: BufferType{TypeCommon: TypeCommon{TypeName: "rddata", IsOptional: false}, Kind: BufferBlob}}, IntType{TypeCommon: TypeCommon{TypeName: "country", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "subclas", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "vendor", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "product", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "version", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "idleto", IsOptional: false}, TypeSize: 4}, ArrayType{TypeCommon: TypeCommon{TypeName: "name", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 0}}}, Dir: DirIn}}}) }() func() { - Calls = append(Calls, &Call{ID: 604, Name: "ioctl$HIDPGETCONNLIST", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdBtHidp}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(2147764434)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "hidp_conndel_req", IsOptional: false}, Fields: []Type{StructType{TypeCommon: TypeCommon{TypeName: "bdaddr", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "addr0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr2", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr3", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr4", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr5", IsOptional: false}, TypeSize: 1}}}, IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 4}}}, Dir: DirIn}}}) + Calls = append(Calls, &Call{ID: 604, Name: "ioctl$HIDPCONNDEL", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdBtHidp}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(1074022601)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "hidp_conndel_req", IsOptional: false}, Fields: []Type{StructType{TypeCommon: TypeCommon{TypeName: "bdaddr", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "addr0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr2", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr3", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr4", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr5", IsOptional: false}, TypeSize: 1}}}, IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 4}}}, Dir: DirIn}}}) }() func() { Calls = append(Calls, &Call{ID: 605, Name: "ioctl$HIDPGETCONNLIST", CallName: "ioctl", Args: []Type{ResourceType{TypeCommon: TypeCommon{TypeName: "fd", IsOptional: false}, Kind: ResFD, Subkind: FdBtHidp}, ConstType{TypeCommon: TypeCommon{TypeName: "cmd", IsOptional: false}, TypeSize: 0, Val: uintptr(2147764434)}, PtrType{TypeCommon: TypeCommon{TypeName: "arg", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "hidp_connlist_req", IsOptional: false}, Fields: []Type{LenType{TypeCommon: TypeCommon{TypeName: "cnum", IsOptional: false}, Buf: "ci", TypeSize: 4}, PtrType{TypeCommon: TypeCommon{TypeName: "ci", IsOptional: false}, Type: ArrayType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, Type: StructType{TypeCommon: TypeCommon{TypeName: "hidp_conninfo", IsOptional: false}, Fields: []Type{StructType{TypeCommon: TypeCommon{TypeName: "bdaddr", IsOptional: false}, Fields: []Type{IntType{TypeCommon: TypeCommon{TypeName: "addr0", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr1", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr2", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr3", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr4", IsOptional: false}, TypeSize: 1}, IntType{TypeCommon: TypeCommon{TypeName: "addr5", IsOptional: false}, TypeSize: 1}}}, IntType{TypeCommon: TypeCommon{TypeName: "flags", IsOptional: false}, TypeSize: 4}, IntType{TypeCommon: TypeCommon{TypeName: "state", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "vendor", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "product", IsOptional: false}, TypeSize: 2}, IntType{TypeCommon: TypeCommon{TypeName: "ver", IsOptional: false}, TypeSize: 2}, ArrayType{TypeCommon: TypeCommon{TypeName: "name", IsOptional: false}, Type: IntType{TypeCommon: TypeCommon{TypeName: "", IsOptional: false}, TypeSize: 1}, Len: 0}}}, Len: 0}, Dir: DirOut}}}, Dir: DirIn}}}) diff --git a/sys/sys.txt b/sys/sys.txt index 5644a8cd6..2e656fd64 100644 --- a/sys/sys.txt +++ b/sys/sys.txt @@ -2772,7 +2772,7 @@ getsockopt$RFCOMM_CONNINFO(fd fd[bt_rfcomm], level const[SOL_RFCOMM], opt const[ socket$bt_hidp(fam const[PF_BLUETOOTH], type const[SOCK_RAW], proto const[BTPROTO_HIDP]) fd[bt_hidp] ioctl$HIDPCONNADD(fd fd[bt_hidp], cmd const[HIDPCONNADD], arg ptr[in, hidp_connadd_req]) -ioctl$HIDPGETCONNLIST(fd fd[bt_hidp], cmd const[HIDPGETCONNLIST], arg ptr[in, hidp_conndel_req]) +ioctl$HIDPCONNDEL(fd fd[bt_hidp], cmd const[HIDPCONNDEL], arg ptr[in, hidp_conndel_req]) ioctl$HIDPGETCONNLIST(fd fd[bt_hidp], cmd const[HIDPGETCONNLIST], arg ptr[in, hidp_connlist_req]) ioctl$HIDPGETCONNINFO(fd fd[bt_hidp], cmd const[HIDPGETCONNINFO], arg ptr[in, hidp_conninfo]) -- cgit mrf-deployment