Skip to content

S
sys
Commit 1e3c7779 authored by Tobias Klauser's avatar Tobias Klauser Committed by Tobias Klauser
Browse files
Options

unix: don't export padding fields on Darwin 

Re-run ./mkall.sh to avoid exporting Pad_cgo* fields on Darwin.

Updates golang/go#18632

Change-Id: Id9d264293d0b1f1c5581aff289c6e826d63e71ef
Reviewed-on: https://go-review.googlesource.com/102075
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarMatt Layher <mdlayher@gmail.com>
parent c488ab1d
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 270 deletions
unix/ztypes_darwin_386.go
View file @ 1e3c7779
...@@ -136,13 +136,13 @@ type Fsid struct { ...@@ -136,13 +136,13 @@ type Fsid struct {
} }
type Dirent struct { type Dirent struct {
Ino uint64 Ino uint64
Seekoff uint64 Seekoff uint64
Reclen uint16 Reclen uint16
Namlen uint16 Namlen uint16
Type uint8 Type uint8
Name [1024]int8 Name [1024]int8
Pad_cgo_0 [3]byte _ [3]byte
} }
type RawSockaddrInet4 struct { type RawSockaddrInet4 struct {
...@@ -295,14 +295,14 @@ const ( ...@@ -295,14 +295,14 @@ const (
) )
type IfMsghdr struct { type IfMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Data IfData Data IfData
} }
type IfData struct { type IfData struct {
...@@ -338,51 +338,51 @@ type IfData struct { ...@@ -338,51 +338,51 @@ type IfData struct {
} }
type IfaMsghdr struct { type IfaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Metric int32 Metric int32
} }
type IfmaMsghdr struct { type IfmaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type IfmaMsghdr2 struct { type IfmaMsghdr2 struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Refcount int32 Refcount int32
} }
type RtMsghdr struct { type RtMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Flags int32 Flags int32
Addrs int32 Addrs int32
Pid int32 Pid int32
Seq int32 Seq int32
Errno int32 Errno int32
Use int32 Use int32
Inits uint32 Inits uint32
Rmx RtMetrics Rmx RtMetrics
} }
type RtMetrics struct { type RtMetrics struct {
...@@ -430,11 +430,11 @@ type BpfInsn struct { ...@@ -430,11 +430,11 @@ type BpfInsn struct {
} }
type BpfHdr struct { type BpfHdr struct {
Tstamp Timeval Tstamp Timeval
Caplen uint32 Caplen uint32
Datalen uint32 Datalen uint32
Hdrlen uint16 Hdrlen uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type Termios struct { type Termios struct {
......
unix/ztypes_darwin_amd64.go
View file @ 1e3c7779
...@@ -26,9 +26,9 @@ type Timespec struct { ...@@ -26,9 +26,9 @@ type Timespec struct {
} }
type Timeval struct { type Timeval struct {
Sec int64 Sec int64
Usec int32 Usec int32
Pad_cgo_0 [4]byte _ [4]byte
} }
type Timeval32 struct { type Timeval32 struct {
...@@ -70,7 +70,7 @@ type Stat_t struct { ...@@ -70,7 +70,7 @@ type Stat_t struct {
Uid uint32 Uid uint32
Gid uint32 Gid uint32
Rdev int32 Rdev int32
Pad_cgo_0 [4]byte _ [4]byte
Atimespec Timespec Atimespec Timespec
Mtimespec Timespec Mtimespec Timespec
Ctimespec Timespec Ctimespec Timespec
...@@ -120,9 +120,9 @@ type Fstore_t struct { ...@@ -120,9 +120,9 @@ type Fstore_t struct {
} }
type Radvisory_t struct { type Radvisory_t struct {
Offset int64 Offset int64
Count int32 Count int32
Pad_cgo_0 [4]byte _ [4]byte
} }
type Fbootstraptransfer_t struct { type Fbootstraptransfer_t struct {
...@@ -132,9 +132,9 @@ type Fbootstraptransfer_t struct { ...@@ -132,9 +132,9 @@ type Fbootstraptransfer_t struct {
} }
type Log2phys_t struct { type Log2phys_t struct {
Flags uint32 Flags uint32
Pad_cgo_0 [8]byte _ [8]byte
Pad_cgo_1 [8]byte _ [8]byte
} }
type Fsid struct { type Fsid struct {
...@@ -142,13 +142,13 @@ type Fsid struct { ...@@ -142,13 +142,13 @@ type Fsid struct {
} }
type Dirent struct { type Dirent struct {
Ino uint64 Ino uint64
Seekoff uint64 Seekoff uint64
Reclen uint16 Reclen uint16
Namlen uint16 Namlen uint16
Type uint8 Type uint8
Name [1024]int8 Name [1024]int8
Pad_cgo_0 [3]byte _ [3]byte
} }
type RawSockaddrInet4 struct { type RawSockaddrInet4 struct {
...@@ -221,10 +221,10 @@ type IPv6Mreq struct { ...@@ -221,10 +221,10 @@ type IPv6Mreq struct {
type Msghdr struct { type Msghdr struct {
Name *byte Name *byte
Namelen uint32 Namelen uint32
Pad_cgo_0 [4]byte _ [4]byte
Iov *Iovec Iov *Iovec
Iovlen int32 Iovlen int32
Pad_cgo_1 [4]byte _ [4]byte
Control *byte Control *byte
Controllen uint32 Controllen uint32
Flags int32 Flags int32
...@@ -303,14 +303,14 @@ const ( ...@@ -303,14 +303,14 @@ const (
) )
type IfMsghdr struct { type IfMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Data IfData Data IfData
} }
type IfData struct { type IfData struct {
...@@ -346,51 +346,51 @@ type IfData struct { ...@@ -346,51 +346,51 @@ type IfData struct {
} }
type IfaMsghdr struct { type IfaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Metric int32 Metric int32
} }
type IfmaMsghdr struct { type IfmaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type IfmaMsghdr2 struct { type IfmaMsghdr2 struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Refcount int32 Refcount int32
} }
type RtMsghdr struct { type RtMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Flags int32 Flags int32
Addrs int32 Addrs int32
Pid int32 Pid int32
Seq int32 Seq int32
Errno int32 Errno int32
Use int32 Use int32
Inits uint32 Inits uint32
Rmx RtMetrics Rmx RtMetrics
} }
type RtMetrics struct { type RtMetrics struct {
...@@ -426,9 +426,9 @@ type BpfStat struct { ...@@ -426,9 +426,9 @@ type BpfStat struct {
} }
type BpfProgram struct { type BpfProgram struct {
Len uint32 Len uint32
Pad_cgo_0 [4]byte _ [4]byte
Insns *BpfInsn Insns *BpfInsn
} }
type BpfInsn struct { type BpfInsn struct {
...@@ -439,22 +439,22 @@ type BpfInsn struct { ...@@ -439,22 +439,22 @@ type BpfInsn struct {
} }
type BpfHdr struct { type BpfHdr struct {
Tstamp Timeval32 Tstamp Timeval32
Caplen uint32 Caplen uint32
Datalen uint32 Datalen uint32
Hdrlen uint16 Hdrlen uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type Termios struct { type Termios struct {
Iflag uint64 Iflag uint64
Oflag uint64 Oflag uint64
Cflag uint64 Cflag uint64
Lflag uint64 Lflag uint64
Cc [20]uint8 Cc [20]uint8
Pad_cgo_0 [4]byte _ [4]byte
Ispeed uint64 Ispeed uint64
Ospeed uint64 Ospeed uint64
} }
type Winsize struct { type Winsize struct {
......
unix/ztypes_darwin_arm.go
View file @ 1e3c7779
...@@ -137,13 +137,13 @@ type Fsid struct { ...@@ -137,13 +137,13 @@ type Fsid struct {
} }
type Dirent struct { type Dirent struct {
Ino uint64 Ino uint64
Seekoff uint64 Seekoff uint64
Reclen uint16 Reclen uint16
Namlen uint16 Namlen uint16
Type uint8 Type uint8
Name [1024]int8 Name [1024]int8
Pad_cgo_0 [3]byte _ [3]byte
} }
type RawSockaddrInet4 struct { type RawSockaddrInet4 struct {
...@@ -296,14 +296,14 @@ const ( ...@@ -296,14 +296,14 @@ const (
) )
type IfMsghdr struct { type IfMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Data IfData Data IfData
} }
type IfData struct { type IfData struct {
...@@ -339,51 +339,51 @@ type IfData struct { ...@@ -339,51 +339,51 @@ type IfData struct {
} }
type IfaMsghdr struct { type IfaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Metric int32 Metric int32
} }
type IfmaMsghdr struct { type IfmaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type IfmaMsghdr2 struct { type IfmaMsghdr2 struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Refcount int32 Refcount int32
} }
type RtMsghdr struct { type RtMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Flags int32 Flags int32
Addrs int32 Addrs int32
Pid int32 Pid int32
Seq int32 Seq int32
Errno int32 Errno int32
Use int32 Use int32
Inits uint32 Inits uint32
Rmx RtMetrics Rmx RtMetrics
} }
type RtMetrics struct { type RtMetrics struct {
...@@ -431,11 +431,11 @@ type BpfInsn struct { ...@@ -431,11 +431,11 @@ type BpfInsn struct {
} }
type BpfHdr struct { type BpfHdr struct {
Tstamp Timeval Tstamp Timeval
Caplen uint32 Caplen uint32
Datalen uint32 Datalen uint32
Hdrlen uint16 Hdrlen uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type Termios struct { type Termios struct {
......
unix/ztypes_darwin_arm64.go
View file @ 1e3c7779
...@@ -26,9 +26,9 @@ type Timespec struct { ...@@ -26,9 +26,9 @@ type Timespec struct {
} }
type Timeval struct { type Timeval struct {
Sec int64 Sec int64
Usec int32 Usec int32
Pad_cgo_0 [4]byte _ [4]byte
} }
type Timeval32 struct { type Timeval32 struct {
...@@ -70,7 +70,7 @@ type Stat_t struct { ...@@ -70,7 +70,7 @@ type Stat_t struct {
Uid uint32 Uid uint32
Gid uint32 Gid uint32
Rdev int32 Rdev int32
Pad_cgo_0 [4]byte _ [4]byte
Atimespec Timespec Atimespec Timespec
Mtimespec Timespec Mtimespec Timespec
Ctimespec Timespec Ctimespec Timespec
...@@ -120,9 +120,9 @@ type Fstore_t struct { ...@@ -120,9 +120,9 @@ type Fstore_t struct {
} }
type Radvisory_t struct { type Radvisory_t struct {
Offset int64 Offset int64
Count int32 Count int32
Pad_cgo_0 [4]byte _ [4]byte
} }
type Fbootstraptransfer_t struct { type Fbootstraptransfer_t struct {
...@@ -132,9 +132,9 @@ type Fbootstraptransfer_t struct { ...@@ -132,9 +132,9 @@ type Fbootstraptransfer_t struct {
} }
type Log2phys_t struct { type Log2phys_t struct {
Flags uint32 Flags uint32
Pad_cgo_0 [8]byte _ [8]byte
Pad_cgo_1 [8]byte _ [8]byte
} }
type Fsid struct { type Fsid struct {
...@@ -142,13 +142,13 @@ type Fsid struct { ...@@ -142,13 +142,13 @@ type Fsid struct {
} }
type Dirent struct { type Dirent struct {
Ino uint64 Ino uint64
Seekoff uint64 Seekoff uint64
Reclen uint16 Reclen uint16
Namlen uint16 Namlen uint16
Type uint8 Type uint8
Name [1024]int8 Name [1024]int8
Pad_cgo_0 [3]byte _ [3]byte
} }
type RawSockaddrInet4 struct { type RawSockaddrInet4 struct {
...@@ -221,10 +221,10 @@ type IPv6Mreq struct { ...@@ -221,10 +221,10 @@ type IPv6Mreq struct {
type Msghdr struct { type Msghdr struct {
Name *byte Name *byte
Namelen uint32 Namelen uint32
Pad_cgo_0 [4]byte _ [4]byte
Iov *Iovec Iov *Iovec
Iovlen int32 Iovlen int32
Pad_cgo_1 [4]byte _ [4]byte
Control *byte Control *byte
Controllen uint32 Controllen uint32
Flags int32 Flags int32
...@@ -303,14 +303,14 @@ const ( ...@@ -303,14 +303,14 @@ const (
) )
type IfMsghdr struct { type IfMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Data IfData Data IfData
} }
type IfData struct { type IfData struct {
...@@ -346,51 +346,51 @@ type IfData struct { ...@@ -346,51 +346,51 @@ type IfData struct {
} }
type IfaMsghdr struct { type IfaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Metric int32 Metric int32
} }
type IfmaMsghdr struct { type IfmaMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type IfmaMsghdr2 struct { type IfmaMsghdr2 struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Addrs int32 Addrs int32
Flags int32 Flags int32
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Refcount int32 Refcount int32
} }
type RtMsghdr struct { type RtMsghdr struct {
Msglen uint16 Msglen uint16
Version uint8 Version uint8
Type uint8 Type uint8
Index uint16 Index uint16
Pad_cgo_0 [2]byte _ [2]byte
Flags int32 Flags int32
Addrs int32 Addrs int32
Pid int32 Pid int32
Seq int32 Seq int32
Errno int32 Errno int32
Use int32 Use int32
Inits uint32 Inits uint32
Rmx RtMetrics Rmx RtMetrics
} }
type RtMetrics struct { type RtMetrics struct {
...@@ -426,9 +426,9 @@ type BpfStat struct { ...@@ -426,9 +426,9 @@ type BpfStat struct {
} }
type BpfProgram struct { type BpfProgram struct {
Len uint32 Len uint32
Pad_cgo_0 [4]byte _ [4]byte
Insns *BpfInsn Insns *BpfInsn
} }
type BpfInsn struct { type BpfInsn struct {
...@@ -439,22 +439,22 @@ type BpfInsn struct { ...@@ -439,22 +439,22 @@ type BpfInsn struct {
} }
type BpfHdr struct { type BpfHdr struct {
Tstamp Timeval32 Tstamp Timeval32
Caplen uint32 Caplen uint32
Datalen uint32 Datalen uint32
Hdrlen uint16 Hdrlen uint16
Pad_cgo_0 [2]byte _ [2]byte
} }
type Termios struct { type Termios struct {
Iflag uint64 Iflag uint64
Oflag uint64 Oflag uint64
Cflag uint64 Cflag uint64
Lflag uint64 Lflag uint64
Cc [20]uint8 Cc [20]uint8
Pad_cgo_0 [4]byte _ [4]byte
Ispeed uint64 Ispeed uint64
Ospeed uint64 Ospeed uint64
} }
type Winsize struct { type Winsize struct {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment