casify syscall and sequelae
R=rsc
DELTA=337 (0 added, 1 deleted, 336 changed)
OCL=22950
CL=22950
diff --git a/src/lib/net/dialgoogle_test.go b/src/lib/net/dialgoogle_test.go
index 4a9f7ff..c323e1e 100644
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/lib/net/dialgoogle_test.go
@@ -17,7 +17,7 @@
// fd is already connected to www.google.com port 80.
// Run an HTTP request to fetch the main page.
-func FetchGoogle(t *testing.T, fd net.Conn, network, addr string) {
+func fetchGoogle(t *testing.T, fd net.Conn, network, addr string) {
req := io.StringBytes("GET / HTTP/1.0\r\nHost: www.google.com\r\n\r\n");
n, errno := fd.Write(req);
@@ -25,27 +25,27 @@
n, errno = io.Readn(fd, buf);
if n < 1000 {
- t.Errorf("FetchGoogle: short HTTP read from %s %s", network, addr);
+ t.Errorf("fetchGoogle: short HTTP read from %s %s", network, addr);
return
}
}
-func DoDial(t *testing.T, network, addr string) {
+func doDial(t *testing.T, network, addr string) {
fd, err := net.Dial(network, "", addr);
if err != nil {
t.Errorf("net.Dial(%q, %q, %q) = _, %v", network, "", addr, err);
return
}
- FetchGoogle(t, fd, network, addr);
+ fetchGoogle(t, fd, network, addr);
fd.Close()
}
-func DoDialTCP(t *testing.T, network, addr string) {
+func doDialTCP(t *testing.T, network, addr string) {
fd, err := net.DialTCP(network, "", addr);
if err != nil {
t.Errorf("net.DialTCP(%q, %q, %q) = _, %v", network, "", addr, err);
} else {
- FetchGoogle(t, fd, network, addr);
+ fetchGoogle(t, fd, network, addr);
}
fd.Close()
}
@@ -76,13 +76,13 @@
continue
}
t.Logf("-- %s --", addr);
- DoDial(t, "tcp", addr);
- DoDialTCP(t, "tcp", addr);
+ doDial(t, "tcp", addr);
+ doDialTCP(t, "tcp", addr);
if addr[0] != '[' {
- DoDial(t, "tcp4", addr);
- DoDialTCP(t, "tcp4", addr)
+ doDial(t, "tcp4", addr);
+ doDialTCP(t, "tcp4", addr)
}
- DoDial(t, "tcp6", addr);
- DoDialTCP(t, "tcp6", addr)
+ doDial(t, "tcp6", addr);
+ doDialTCP(t, "tcp6", addr)
}
}
diff --git a/src/lib/net/fd.go b/src/lib/net/fd.go
index 10574cd..b93f041 100644
--- a/src/lib/net/fd.go
+++ b/src/lib/net/fd.go
@@ -28,11 +28,11 @@
// Make reads and writes on fd return EAGAIN instead of blocking.
func _SetNonblock(fd int64) *os.Error {
- flags, e := syscall.fcntl(fd, syscall.F_GETFL, 0);
+ flags, e := syscall.Fcntl(fd, syscall.F_GETFL, 0);
if e != 0 {
return os.ErrnoToError(e)
}
- flags, e = syscall.fcntl(fd, syscall.F_SETFL, flags | syscall.O_NONBLOCK);
+ flags, e = syscall.Fcntl(fd, syscall.F_SETFL, flags | syscall.O_NONBLOCK);
if e != 0 {
return os.ErrnoToError(e)
}
@@ -272,16 +272,16 @@
if fd == nil || fd.osfd == nil {
return nil, os.EINVAL
}
- s, e := syscall.accept(fd.fd, sa);
+ s, e := syscall.Accept(fd.fd, sa);
for e == syscall.EAGAIN {
pollserver.WaitRead(fd);
- s, e = syscall.accept(fd.fd, sa)
+ s, e = syscall.Accept(fd.fd, sa)
}
if e != 0 {
return nil, os.ErrnoToError(e)
}
if nfd, err = NewFD(s); err != nil {
- syscall.close(s);
+ syscall.Close(s);
return nil, err
}
return nfd, nil
diff --git a/src/lib/net/fd_darwin.go b/src/lib/net/fd_darwin.go
index a92ad78..34fd90f 100644
--- a/src/lib/net/fd_darwin.go
+++ b/src/lib/net/fd_darwin.go
@@ -14,14 +14,14 @@
export type Pollster struct {
kq int64;
- eventbuf [10]syscall.Kevent;
- events []syscall.Kevent;
+ eventbuf [10]syscall.Kevent_t;
+ events []syscall.Kevent_t;
}
export func NewPollster() (p *Pollster, err *os.Error) {
p = new(Pollster);
var e int64;
- if p.kq, e = syscall.kqueue(); e != 0 {
+ if p.kq, e = syscall.Kqueue(); e != 0 {
return nil, os.ErrnoToError(e)
}
p.events = p.eventbuf[0:0];
@@ -35,36 +35,36 @@
} else {
kmode = syscall.EVFILT_WRITE
}
- var events [1]syscall.Kevent;
+ var events [1]syscall.Kevent_t;
ev := &events[0];
- ev.ident = fd;
- ev.filter = kmode;
+ ev.Ident = fd;
+ ev.Filter = kmode;
// EV_ADD - add event to kqueue list
// EV_RECEIPT - generate fake EV_ERROR as result of add,
// rather than waiting for real event
// EV_ONESHOT - delete the event the first time it triggers
- ev.flags = syscall.EV_ADD | syscall.EV_RECEIPT;
+ ev.Flags = syscall.EV_ADD | syscall.EV_RECEIPT;
if !repeat {
- ev.flags |= syscall.EV_ONESHOT
+ ev.Flags |= syscall.EV_ONESHOT
}
- n, e := syscall.kevent(p.kq, events, events, nil);
+ n, e := syscall.Kevent(p.kq, events, events, nil);
if e != 0 {
return os.ErrnoToError(e)
}
- if n != 1 || (ev.flags & syscall.EV_ERROR) == 0 || ev.ident != fd || ev.filter != kmode {
+ if n != 1 || (ev.Flags & syscall.EV_ERROR) == 0 || ev.Ident != fd || ev.Filter != kmode {
return os.NewError("kqueue phase error")
}
- if ev.data != 0 {
- return os.ErrnoToError(ev.data)
+ if ev.Data != 0 {
+ return os.ErrnoToError(ev.Data)
}
return nil
}
func (p *Pollster) WaitFD() (fd int64, mode int, err *os.Error) {
for len(p.events) == 0 {
- nn, e := syscall.kevent(p.kq, nil, p.eventbuf, nil);
+ nn, e := syscall.Kevent(p.kq, nil, p.eventbuf, nil);
if e != 0 {
if e == syscall.EAGAIN || e == syscall.EINTR {
continue
@@ -75,8 +75,8 @@
}
ev := &p.events[0];
p.events = p.events[1:len(p.events)];
- fd = ev.ident;
- if ev.filter == syscall.EVFILT_READ {
+ fd = ev.Ident;
+ if ev.Filter == syscall.EVFILT_READ {
mode = 'r'
} else {
mode = 'w'
@@ -85,6 +85,6 @@
}
func (p *Pollster) Close() *os.Error {
- r, e := syscall.close(p.kq);
+ r, e := syscall.Close(p.kq);
return os.ErrnoToError(e)
}
diff --git a/src/lib/net/net.go b/src/lib/net/net.go
index 98842c7..240d5dc 100644
--- a/src/lib/net/net.go
+++ b/src/lib/net/net.go
@@ -117,7 +117,7 @@
// Convert socket address into "host:port".
func _SockaddrToHostPort(sa *syscall.Sockaddr) (hostport string, err *os.Error) {
- switch sa.family {
+ switch sa.Family {
case syscall.AF_INET, syscall.AF_INET6:
addr, port, e := SockaddrToIP(sa);
if e != nil {
@@ -141,34 +141,34 @@
// Generic _Socket creation.
func _Socket(f, p, t int64, la, ra *syscall.Sockaddr) (fd *FD, err *os.Error) {
- s, e := syscall.socket(f, p, t);
+ s, e := syscall.Socket(f, p, t);
if e != 0 {
return nil, os.ErrnoToError(e)
}
// Allow reuse of recently-used addresses.
- syscall.setsockopt_int(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1);
+ syscall.Setsockopt_int(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1);
var r int64;
if la != nil {
- r, e = syscall.bind(s, la);
+ r, e = syscall.Bind(s, la);
if e != 0 {
- syscall.close(s);
+ syscall.Close(s);
return nil, os.ErrnoToError(e)
}
}
if ra != nil {
- r, e = syscall.connect(s, ra);
+ r, e = syscall.Connect(s, ra);
if e != 0 {
- syscall.close(s);
+ syscall.Close(s);
return nil, os.ErrnoToError(e)
}
}
fd, err = NewFD(s);
if err != nil {
- syscall.close(s);
+ syscall.Close(s);
return nil, err
}
@@ -227,11 +227,11 @@
func setsockopt_int(fd, level, opt int64, value int) *os.Error {
- return os.ErrnoToError(syscall.setsockopt_int(fd, level, opt, value));
+ return os.ErrnoToError(syscall.Setsockopt_int(fd, level, opt, value));
}
func setsockopt_tv(fd, level, opt int64, nsec int64) *os.Error {
- return os.ErrnoToError(syscall.setsockopt_tv(fd, level, opt, nsec));
+ return os.ErrnoToError(syscall.Setsockopt_tv(fd, level, opt, nsec));
}
func (c *_ConnBase) SetReadBuffer(bytes int) *os.Error {
@@ -275,7 +275,7 @@
}
func (c *_ConnBase) SetLinger(sec int) *os.Error {
- e := syscall.setsockopt_linger(c.FD(), syscall.SOL_SOCKET, syscall.SO_LINGER, sec);
+ e := syscall.Setsockopt_linger(c.FD(), syscall.SOL_SOCKET, syscall.SO_LINGER, sec);
return os.ErrnoToError(e);
}
@@ -492,9 +492,9 @@
if e != nil {
return nil, e
}
- r, e1 := syscall.listen(fd.fd, ListenBacklog());
+ r, e1 := syscall.Listen(fd.fd, ListenBacklog());
if e1 != 0 {
- syscall.close(fd.fd);
+ syscall.Close(fd.fd);
return nil, os.ErrnoToError(e1)
}
l = new(ListenerTCP);
diff --git a/src/lib/net/net_darwin.go b/src/lib/net/net_darwin.go
index 2ad0043..062f5ea 100644
--- a/src/lib/net/net_darwin.go
+++ b/src/lib/net/net_darwin.go
@@ -17,12 +17,12 @@
return nil, os.EINVAL
}
sa := new(syscall.SockaddrInet4);
- sa.len = syscall.SizeofSockaddrInet4;
- sa.family = syscall.AF_INET;
- sa.port[0] = byte(port>>8);
- sa.port[1] = byte(port);
+ sa.Len = syscall.SizeofSockaddrInet4;
+ sa.Family = syscall.AF_INET;
+ sa.Port[0] = byte(port>>8);
+ sa.Port[1] = byte(port);
for i := 0; i < IPv4len; i++ {
- sa.addr[i] = p[i]
+ sa.Addr[i] = p[i]
}
return unsafe.pointer(sa).(*syscall.Sockaddr), nil
}
@@ -33,33 +33,33 @@
return nil, os.EINVAL
}
sa := new(syscall.SockaddrInet6);
- sa.len = syscall.SizeofSockaddrInet6;
- sa.family = syscall.AF_INET6;
- sa.port[0] = byte(port>>8);
- sa.port[1] = byte(port);
+ sa.Len = syscall.SizeofSockaddrInet6;
+ sa.Family = syscall.AF_INET6;
+ sa.Port[0] = byte(port>>8);
+ sa.Port[1] = byte(port);
for i := 0; i < IPv6len; i++ {
- sa.addr[i] = p[i]
+ sa.Addr[i] = p[i]
}
return unsafe.pointer(sa).(*syscall.Sockaddr), nil
}
export func SockaddrToIP(sa1 *syscall.Sockaddr) (p []byte, port int, err *os.Error) {
- switch sa1.family {
+ switch sa1.Family {
case syscall.AF_INET:
sa := unsafe.pointer(sa1).(*syscall.SockaddrInet4);
- a := ToIPv6(sa.addr);
+ a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
}
- return a, int(sa.port[0])<<8 + int(sa.port[1]), nil;
+ return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
case syscall.AF_INET6:
sa := unsafe.pointer(sa1).(*syscall.SockaddrInet6);
- a := ToIPv6(sa.addr);
+ a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
}
- return nil, int(sa.port[0])<<8 + int(sa.port[1]), nil;
+ return nil, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
default:
return nil, 0, os.EINVAL
}
diff --git a/src/lib/net/parse_test.go b/src/lib/net/parse_test.go
index 2c2cabe..8749826 100644
--- a/src/lib/net/parse_test.go
+++ b/src/lib/net/parse_test.go
@@ -14,7 +14,7 @@
export func TestReadLine(t *testing.T) {
filename := "/etc/services"; // a nice big file
- fd, err := os._Open(filename, os.O_RDONLY, 0);
+ fd, err := os.Open(filename, os.O_RDONLY, 0);
if err != nil {
t.Fatalf("open %s: %v", filename, err);
}
