delete export
TBR=r
OCL=23121
CL=23127
diff --git a/src/lib/net/dialgoogle_test.go b/src/lib/net/dialgoogle_test.go
index c323e1e..de7158a 100644
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/lib/net/dialgoogle_test.go
@@ -64,7 +64,7 @@
"[2001:4860:0:2001::68]:80" // ipv6.google.com; removed if ipv6 flag not set
}
-export func TestDialGoogle(t *testing.T) {
+func TestDialGoogle(t *testing.T) {
// If no ipv6 tunnel, don't try the last address.
if !*ipv6 {
googleaddrs[len(googleaddrs)-1] = ""
diff --git a/src/lib/net/dnsclient.go b/src/lib/net/dnsclient.go
index 67af9b7..5c26d51 100644
--- a/src/lib/net/dnsclient.go
+++ b/src/lib/net/dnsclient.go
@@ -25,7 +25,7 @@
"strings";
)
-export var (
+var (
DNS_InternalError = os.NewError("internal dns error");
DNS_MissingConfig = os.NewError("no dns configuration");
DNS_No_Answer = os.NewError("dns got no answer");
@@ -171,7 +171,7 @@
cfg = DNS_ReadConfig();
}
-export func LookupHost(name string) (name1 string, addrs []string, err *os.Error) {
+func LookupHost(name string) (name1 string, addrs []string, err *os.Error) {
// TODO(rsc): Pick out obvious non-DNS names to avoid
// sending stupid requests to the server?
diff --git a/src/lib/net/dnsconfig.go b/src/lib/net/dnsconfig.go
index 3de9e24..e57ce59 100644
--- a/src/lib/net/dnsconfig.go
+++ b/src/lib/net/dnsconfig.go
@@ -13,7 +13,7 @@
"strconv";
)
-export type DNS_Config struct {
+type DNS_Config struct {
servers []string; // servers to use
search []string; // suffixes to append to local name
ndots int; // number of dots in name to trigger absolute lookup
@@ -26,7 +26,7 @@
// TODO(rsc): Supposed to call uname() and chop the beginning
// of the host name to get the default search domain.
// We assume it's in resolv.conf anyway.
-export func DNS_ReadConfig() *DNS_Config {
+func DNS_ReadConfig() *DNS_Config {
file := _Open("/etc/resolv.conf");
if file == nil {
return nil
diff --git a/src/lib/net/dnsmsg.go b/src/lib/net/dnsmsg.go
index 159ea7b..2cd8b2f 100644
--- a/src/lib/net/dnsmsg.go
+++ b/src/lib/net/dnsmsg.go
@@ -32,7 +32,7 @@
// _Packet formats
// Wire constants.
-export const (
+const (
// valid DNS_RR_Header.rrtype and DNS_Question.qtype
DNS_TypeA = 1;
DNS_TypeNS = 2;
@@ -90,7 +90,7 @@
)
// DNS queries.
-export type DNS_Question struct {
+type DNS_Question struct {
name string "domain-name"; // "domain-name" specifies encoding; see packers below
qtype uint16;
qclass uint16;
@@ -99,7 +99,7 @@
// DNS responses (resource records).
// There are many types of messages,
// but they all share the same header.
-export type DNS_RR_Header struct {
+type DNS_RR_Header struct {
name string "domain-name";
rrtype uint16;
class uint16;
@@ -111,62 +111,62 @@
return h
}
-export type DNS_RR interface {
+type DNS_RR interface {
Header() *DNS_RR_Header
}
// Specific DNS RR formats for each query type.
-export type DNS_RR_CNAME struct {
+type DNS_RR_CNAME struct {
DNS_RR_Header;
cname string "domain-name";
}
-export type DNS_RR_HINFO struct {
+type DNS_RR_HINFO struct {
DNS_RR_Header;
cpu string;
os string;
}
-export type DNS_RR_MB struct {
+type DNS_RR_MB struct {
DNS_RR_Header;
mb string "domain-name";
}
-export type DNS_RR_MG struct {
+type DNS_RR_MG struct {
DNS_RR_Header;
mg string "domain-name";
}
-export type DNS_RR_MINFO struct {
+type DNS_RR_MINFO struct {
DNS_RR_Header;
rmail string "domain-name";
email string "domain-name";
}
-export type DNS_RR_MR struct {
+type DNS_RR_MR struct {
DNS_RR_Header;
mr string "domain-name";
}
-export type DNS_RR_MX struct {
+type DNS_RR_MX struct {
DNS_RR_Header;
pref uint16;
mx string "domain-name";
}
-export type DNS_RR_NS struct {
+type DNS_RR_NS struct {
DNS_RR_Header;
ns string "domain-name";
}
-export type DNS_RR_PTR struct {
+type DNS_RR_PTR struct {
DNS_RR_Header;
ptr string "domain-name";
}
-export type DNS_RR_SOA struct {
+type DNS_RR_SOA struct {
DNS_RR_Header;
ns string "domain-name";
mbox string "domain-name";
@@ -177,12 +177,12 @@
minttl uint32;
}
-export type DNS_RR_TXT struct {
+type DNS_RR_TXT struct {
DNS_RR_Header;
txt string; // not domain name
}
-export type DNS_RR_A struct {
+type DNS_RR_A struct {
DNS_RR_Header;
a uint32 "ipv4";
}
@@ -537,7 +537,7 @@
rcode int;
}
-export type DNS_Msg struct {
+type DNS_Msg struct {
_DNS_Msg_Top;
question []DNS_Question;
answer []DNS_RR;
diff --git a/src/lib/net/fd.go b/src/lib/net/fd.go
index b93f041..ce18cca 100644
--- a/src/lib/net/fd.go
+++ b/src/lib/net/fd.go
@@ -15,7 +15,7 @@
// Network file descriptor. Only intended to be used internally,
// but have to export to make it available in other files implementing package net.
-export type FD struct {
+type FD struct {
// immutable until Close
fd int64;
osfd *os.FD;
@@ -207,7 +207,7 @@
pollserver = p
}
-export func NewFD(fd int64) (f *FD, err *os.Error) {
+func NewFD(fd int64) (f *FD, err *os.Error) {
if pollserver == nil {
once.Do(&_StartServer);
}
diff --git a/src/lib/net/fd_darwin.go b/src/lib/net/fd_darwin.go
index 34fd90f..342f9c9 100644
--- a/src/lib/net/fd_darwin.go
+++ b/src/lib/net/fd_darwin.go
@@ -12,13 +12,13 @@
"syscall";
)
-export type Pollster struct {
+type Pollster struct {
kq int64;
eventbuf [10]syscall.Kevent_t;
events []syscall.Kevent_t;
}
-export func NewPollster() (p *Pollster, err *os.Error) {
+func NewPollster() (p *Pollster, err *os.Error) {
p = new(Pollster);
var e int64;
if p.kq, e = syscall.Kqueue(); e != 0 {
diff --git a/src/lib/net/fd_linux.go b/src/lib/net/fd_linux.go
index 5060e99..cef0eda 100644
--- a/src/lib/net/fd_linux.go
+++ b/src/lib/net/fd_linux.go
@@ -17,14 +17,14 @@
writeFlags = syscall.EPOLLOUT
)
-export type Pollster struct {
+type Pollster struct {
epfd int64;
// Events we're already waiting for
events map[int64] uint32;
}
-export func NewPollster() (p *Pollster, err *os.Error) {
+func NewPollster() (p *Pollster, err *os.Error) {
p = new(Pollster);
var e int64;
diff --git a/src/lib/net/ip.go b/src/lib/net/ip.go
index 15d09a3..89bbeba 100644
--- a/src/lib/net/ip.go
+++ b/src/lib/net/ip.go
@@ -16,7 +16,7 @@
"net"
)
-export const (
+const (
IPv4len = 4;
IPv6len = 16
)
@@ -37,7 +37,7 @@
}
// Well-known IP addresses
-export var IPv4bcast, IPv4allsys, IPv4allrouter, IPv4prefix, IPallbits, IPnoaddr []byte
+var IPv4bcast, IPv4allsys, IPv4allrouter, IPv4prefix, IPallbits, IPnoaddr []byte
func init() {
IPv4bcast = _MakeIPv4(0xff, 0xff, 0xff, 0xff);
@@ -63,7 +63,7 @@
// Is p an IPv4 address (perhaps in IPv6 form)?
// If so, return the 4-byte V4 array.
-export func ToIPv4(p []byte) []byte {
+func ToIPv4(p []byte) []byte {
if len(p) == IPv4len {
return p
}
@@ -77,7 +77,7 @@
}
// Convert p to IPv6 form.
-export func ToIPv6(p []byte) []byte {
+func ToIPv6(p []byte) []byte {
if len(p) == IPv4len {
return _MakeIPv4(p[0], p[1], p[2], p[3])
}
@@ -88,13 +88,13 @@
}
// Default route masks for IPv4.
-export var (
+var (
ClassAMask = _MakeIPv4(0xff, 0, 0, 0);
ClassBMask = _MakeIPv4(0xff, 0xff, 0, 0);
ClassCMask = _MakeIPv4(0xff, 0xff, 0xff, 0);
)
-export func DefaultMask(p []byte) []byte {
+func DefaultMask(p []byte) []byte {
if p = ToIPv4(p); p == nil {
return nil
}
@@ -110,7 +110,7 @@
}
// Apply mask to ip, returning new address.
-export func Mask(ip []byte, mask []byte) []byte {
+func Mask(ip []byte, mask []byte) []byte {
n := len(ip);
if n != len(mask) {
return nil
@@ -159,7 +159,7 @@
}
// Convert IP address to string.
-export func IPToString(p []byte) string {
+func IPToString(p []byte) string {
// If IPv4, use dotted notation.
if p4 := ToIPv4(p); len(p4) == 4 {
return itod(uint(p4[0]))+"."
@@ -228,7 +228,7 @@
return n
}
-export func MaskToString(mask []byte) string {
+func MaskToString(mask []byte) string {
switch len(mask) {
case 4:
n := _SimpleMaskLength(mask);
@@ -377,7 +377,7 @@
return p
}
-export func ParseIP(s string) []byte {
+func ParseIP(s string) []byte {
p := _ParseIPv4(s);
if p != nil {
return p
diff --git a/src/lib/net/ip_test.go b/src/lib/net/ip_test.go
index a6b6c6f..9788db2 100644
--- a/src/lib/net/ip_test.go
+++ b/src/lib/net/ip_test.go
@@ -43,7 +43,7 @@
parseIPTest{"::ffff:4a7d:1363", _IPv4(74, 125, 19, 99)},
}
-export func TestParseIP(t *testing.T) {
+func TestParseIP(t *testing.T) {
for i := 0; i < len(parseiptests); i++ {
tt := parseiptests[i];
if out := ParseIP(tt.in); !isEqual(out, tt.out) {
diff --git a/src/lib/net/net.go b/src/lib/net/net.go
index 240d5dc..4417204 100644
--- a/src/lib/net/net.go
+++ b/src/lib/net/net.go
@@ -11,7 +11,7 @@
"syscall";
)
-export var (
+var (
BadAddress = os.NewError("malformed address");
MissingAddress = os.NewError("missing address");
UnknownNetwork = os.NewError("unknown network");
@@ -21,7 +21,7 @@
Unknown_SocketFamily = os.NewError("unknown socket family");
)
-export func LookupHost(name string) (name1 string, addrs []string, err *os.Error)
+func LookupHost(name string) (name1 string, addrs []string, err *os.Error)
// Split "host:port" into "host" and "port".
// Host cannot contain colons unless it is bracketed.
@@ -358,7 +358,7 @@
// TCP connections.
-export type ConnTCP struct {
+type ConnTCP struct {
_ConnBase
}
@@ -377,7 +377,7 @@
return c
}
-export func DialTCP(net, laddr, raddr string) (c *ConnTCP, err *os.Error) {
+func DialTCP(net, laddr, raddr string) (c *ConnTCP, err *os.Error) {
if raddr == "" {
return nil, MissingAddress
}
@@ -393,7 +393,7 @@
// TODO(rsc): UDP headers mode
-export type ConnUDP struct {
+type ConnUDP struct {
_ConnBase
}
@@ -404,7 +404,7 @@
return c
}
-export func DialUDP(net, laddr, raddr string) (c *ConnUDP, err *os.Error) {
+func DialUDP(net, laddr, raddr string) (c *ConnUDP, err *os.Error) {
if raddr == "" {
return nil, MissingAddress
}
@@ -422,7 +422,7 @@
// TODO: raw ethernet connections
-export type Conn interface {
+type Conn interface {
Read(b []byte) (n int, err *os.Error);
Write(b []byte) (n int, err *os.Error);
ReadFrom(b []byte) (n int, addr string, err *os.Error);
@@ -450,7 +450,7 @@
// Eventually, we plan to allow names in addition to IP addresses,
// but that requires writing a DNS library.
-export func Dial(net, laddr, raddr string) (c Conn, err *os.Error) {
+func Dial(net, laddr, raddr string) (c Conn, err *os.Error) {
switch net {
case "tcp", "tcp4", "tcp6":
c, err := DialTCP(net, laddr, raddr);
@@ -477,17 +477,17 @@
}
-export type Listener interface {
+type Listener interface {
Accept() (c Conn, raddr string, err *os.Error);
Close() *os.Error;
}
-export type ListenerTCP struct {
+type ListenerTCP struct {
fd *FD;
laddr string
}
-export func ListenTCP(net, laddr string) (l *ListenerTCP, err *os.Error) {
+func ListenTCP(net, laddr string) (l *ListenerTCP, err *os.Error) {
fd, e := _InternetSocket(net, laddr, "", syscall.SOCK_STREAM, "listen");
if e != nil {
return nil, e
@@ -534,7 +534,7 @@
return l.fd.Close()
}
-export func Listen(net, laddr string) (l Listener, err *os.Error) {
+func Listen(net, laddr string) (l Listener, err *os.Error) {
switch net {
case "tcp", "tcp4", "tcp6":
l, err := ListenTCP(net, laddr);
diff --git a/src/lib/net/net_darwin.go b/src/lib/net/net_darwin.go
index 062f5ea..2d5d11e 100644
--- a/src/lib/net/net_darwin.go
+++ b/src/lib/net/net_darwin.go
@@ -11,7 +11,7 @@
"unsafe";
)
-export func IPv4ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
+func IPv4ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
p = ToIPv4(p);
if p == nil || port < 0 || port > 0xFFFF {
return nil, os.EINVAL
@@ -24,10 +24,10 @@
for i := 0; i < IPv4len; i++ {
sa.Addr[i] = p[i]
}
- return unsafe.pointer(sa).(*syscall.Sockaddr), nil
+ return unsafe.Pointer(sa).(*syscall.Sockaddr), nil
}
-export func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
+func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
p = ToIPv6(p);
if p == nil || port < 0 || port > 0xFFFF {
return nil, os.EINVAL
@@ -40,21 +40,21 @@
for i := 0; i < IPv6len; i++ {
sa.Addr[i] = p[i]
}
- return unsafe.pointer(sa).(*syscall.Sockaddr), nil
+ return unsafe.Pointer(sa).(*syscall.Sockaddr), nil
}
-export func SockaddrToIP(sa1 *syscall.Sockaddr) (p []byte, port int, err *os.Error) {
+func SockaddrToIP(sa1 *syscall.Sockaddr) (p []byte, port int, err *os.Error) {
switch sa1.Family {
case syscall.AF_INET:
- sa := unsafe.pointer(sa1).(*syscall.SockaddrInet4);
+ sa := unsafe.Pointer(sa1).(*syscall.SockaddrInet4);
a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
}
return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
case syscall.AF_INET6:
- sa := unsafe.pointer(sa1).(*syscall.SockaddrInet6);
+ sa := unsafe.Pointer(sa1).(*syscall.SockaddrInet6);
a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
@@ -66,7 +66,7 @@
return nil, 0, nil // not reached
}
-export func ListenBacklog() int64 {
+func ListenBacklog() int64 {
return syscall.SOMAXCONN
}
diff --git a/src/lib/net/net_linux.go b/src/lib/net/net_linux.go
index c384711..7538f62 100644
--- a/src/lib/net/net_linux.go
+++ b/src/lib/net/net_linux.go
@@ -11,7 +11,7 @@
"unsafe";
)
-export func IPv4ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
+func IPv4ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
p = ToIPv4(p);
if p == nil || port < 0 || port > 0xFFFF {
return nil, os.EINVAL
@@ -23,12 +23,12 @@
for i := 0; i < IPv4len; i++ {
sa.Addr[i] = p[i]
}
- return unsafe.pointer(sa).(*syscall.Sockaddr), nil
+ return unsafe.Pointer(sa).(*syscall.Sockaddr), nil
}
var _IPv6zero [16]byte;
-export func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
+func IPv6ToSockaddr(p []byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) {
p = ToIPv6(p);
if p == nil || port < 0 || port > 0xFFFF {
return nil, os.EINVAL
@@ -48,20 +48,20 @@
for i := 0; i < IPv6len; i++ {
sa.Addr[i] = p[i]
}
- return unsafe.pointer(sa).(*syscall.Sockaddr), nil
+ return unsafe.Pointer(sa).(*syscall.Sockaddr), nil
}
-export func SockaddrToIP(sa1 *syscall.Sockaddr) (p []byte, port int, err *os.Error) {
+func SockaddrToIP(sa1 *syscall.Sockaddr) (p []byte, port int, err *os.Error) {
switch sa1.Family {
case syscall.AF_INET:
- sa := unsafe.pointer(sa1).(*syscall.SockaddrInet4);
+ sa := unsafe.Pointer(sa1).(*syscall.SockaddrInet4);
a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
}
return a, int(sa.Port[0])<<8 + int(sa.Port[1]), nil;
case syscall.AF_INET6:
- sa := unsafe.pointer(sa1).(*syscall.SockaddrInet6);
+ sa := unsafe.Pointer(sa1).(*syscall.SockaddrInet6);
a := ToIPv6(sa.Addr);
if a == nil {
return nil, 0, os.EINVAL
@@ -73,7 +73,7 @@
return nil, 0, nil // not reached
}
-export func ListenBacklog() int64 {
+func ListenBacklog() int64 {
// TODO: Read the limit from /proc/sys/net/core/somaxconn,
// to take advantage of kernels that have raised the limit.
return syscall.SOMAXCONN
diff --git a/src/lib/net/parse_test.go b/src/lib/net/parse_test.go
index 8749826..633a457 100644
--- a/src/lib/net/parse_test.go
+++ b/src/lib/net/parse_test.go
@@ -11,7 +11,7 @@
"testing";
)
-export func TestReadLine(t *testing.T) {
+func TestReadLine(t *testing.T) {
filename := "/etc/services"; // a nice big file
fd, err := os.Open(filename, os.O_RDONLY, 0);
diff --git a/src/lib/net/port.go b/src/lib/net/port.go
index d8ac8c7..03c0cce 100644
--- a/src/lib/net/port.go
+++ b/src/lib/net/port.go
@@ -48,7 +48,7 @@
file.Close();
}
-export func LookupPort(netw, name string) (port int, ok bool) {
+func LookupPort(netw, name string) (port int, ok bool) {
once.Do(&_ReadServices);
switch netw {
diff --git a/src/lib/net/port_test.go b/src/lib/net/port_test.go
index 0bfff49..f6123fd 100644
--- a/src/lib/net/port_test.go
+++ b/src/lib/net/port_test.go
@@ -48,7 +48,7 @@
portTest{ "tcp", "--badport--", 0, false },
}
-export func TestLookupPort(t *testing.T) {
+func TestLookupPort(t *testing.T) {
for i := 0; i < len(porttests); i++ {
tt := porttests[i];
if port, ok := LookupPort(tt.netw, tt.name); port != tt.port || ok != tt.ok {
diff --git a/src/lib/net/tcpserver_test.go b/src/lib/net/tcpserver_test.go
index 4003747..820220b 100644
--- a/src/lib/net/tcpserver_test.go
+++ b/src/lib/net/tcpserver_test.go
@@ -75,7 +75,7 @@
<-done; // make sure server stopped
}
-export func TestTcpServer(t *testing.T) {
+func TestTcpServer(t *testing.T) {
doTest(t, "tcp", "0.0.0.0:9997", "127.0.0.1:9997");
doTest(t, "tcp", "[::]:9997", "[::ffff:127.0.0.1]:9997");
doTest(t, "tcp", "[::]:9997", "127.0.0.1:9997");
