gofmt-ify nacl

R=rsc
http://go/go-review/1018062

src/pkg/exp/nacl/av/av.go

@@ -21,7 +21,7 @@ import (
 	"unsafe";
 )
 
-var srpcEnabled = srpc.Enabled();
+var srpcEnabled = srpc.Enabled()
 
 // native_client/src/trusted/service_runtime/include/sys/audio_video.h
 
@@ -89,7 +89,7 @@ func Init(subsys int, dx, dy int) (*Window, os.Error) {
 	xsubsys := subsys;
 	if srpcEnabled {
 		waitBridge();
-		xsubsys &^= SubsystemVideo|SubsystemEmbed;
+		xsubsys &^= SubsystemVideo | SubsystemEmbed;
 	}
 
 	if xsubsys & SubsystemEmbed != 0 {
@@ -102,7 +102,7 @@ func Init(subsys int, dx, dy int) (*Window, os.Error) {
 		return nil, err;
 	}
 
-	if subsys&SubsystemVideo != 0 {
+	if subsys & SubsystemVideo != 0 {
 		if dx, dy, err = videoInit(dx, dy); err != nil {
 			return nil, err;
 		}
@@ -113,7 +113,7 @@ func Init(subsys int, dx, dy int) (*Window, os.Error) {
 		w.quitc = make(chan bool);
 	}
 
-	if subsys&SubsystemAudio != 0 {
+	if subsys & SubsystemAudio != 0 {
 		var n int;
 		if n, err = audioInit(AudioFormatStereo44K, 2048); err != nil {
 			return nil, err;
@@ -121,7 +121,7 @@ func Init(subsys int, dx, dy int) (*Window, os.Error) {
 		println("audio", n);
 	}
 
-	if subsys&SubsystemVideo != 0 {
+	if subsys & SubsystemVideo != 0 {
 		go w.readEvents();
 	}
 
@@ -158,7 +158,7 @@ func videoUpdate(data []Color) (err os.Error) {
 	return os.NewSyscallError("video_update", syscall.VideoUpdate((*uint32)(&data[0])));
 }
 
-var noEvents = os.NewError("no events");
+var noEvents = os.NewError("no events")
 
 func videoPollEvent(ev []byte) (err os.Error) {
 	if srpcEnabled {
@@ -167,7 +167,7 @@ func videoPollEvent(ev []byte) (err os.Error) {
 			return noEvents;
 		}
 		bytes.Copy(ev, &bridge.share.eq.event[r]);
-		bridge.share.eq.ri = (r+1) % eqsize;
+		bridge.share.eq.ri = (r+1)%eqsize;
 		return nil;
 	}
 	return os.NewSyscallError("video_poll_event", syscall.VideoPollEvent(&ev[0]));
@@ -227,7 +227,7 @@ func waitBridge() {
 	bridge.c <- <-bridge.c;
 }
 
-const eqsize = 64;
+const eqsize = 64
 
 // Data structure shared with host via mmap.
 type videoShare struct {
@@ -271,7 +271,7 @@ func (multimediaBridge) Run(arg, ret []interface{}, size []int) srpc.Errno {
 	addr, _, errno := syscall.Syscall6(syscall.SYS_MMAP,
 		0,
 		uintptr(st.Size),
-		syscall.PROT_READ|syscall.PROT_WRITE,
+		syscall.PROT_READ | syscall.PROT_WRITE,
 		syscall.MAP_SHARED,
 		uintptr(bridge.displayFd),
 		0);
@@ -284,8 +284,8 @@ func (multimediaBridge) Run(arg, ret []interface{}, size []int) srpc.Errno {
 	// Overestimate frame buffer size
 	// (must use a compile-time constant)
 	// and then reslice.  256 megapixels (1 GB) should be enough.
-	fb := (*[256*1024*1024]Color)(unsafe.Pointer(addr+videoShareSize));
-	bridge.pixel = fb[0:(st.Size - videoShareSize)/4];
+	fb := (*[256*1024*1024]Color)(unsafe.Pointer(addr + videoShareSize));
+	bridge.pixel = fb[0 : (st.Size - videoShareSize)/4];
 
 	// Configure RPC connection back to client.
 	var err os.Error;
@@ -308,4 +308,3 @@ func init() {
 		srpc.Add("nacl_multimedia_bridge", "hh:", multimediaBridge{});
 	}
 }
-

src/pkg/exp/nacl/av/event.go

@@ -19,7 +19,8 @@ import (
 )
 
 // An eventType identifies the type of a Native Client Event.
-type eventType uint8;
+type eventType uint8
+
 const (
 	eventActive	= 1+iota;
 	eventExpose;
@@ -34,6 +35,7 @@ const (
 
 // A key represents a key on a keyboard.
 type key uint16
+
 const (
 	keyUnknown	= 0;
 	keyFirst	= 0;
@@ -280,15 +282,16 @@ const (
 	keyUndo		= 322;
 
 	// Add any other keys here
-	keyLast
+	keyLast;
 )
 
 // A keymod is a set of bit flags
 type keymod uint16
+
 const (
 	keymodNone	= 0x0000;
-	keymodLshift= 0x0001;
-	keymodRshift= 0x0002;
+	keymodLshift	= 0x0001;
+	keymodRshift	= 0x0002;
 	keymodLctrl	= 0x0040;
 	keymodRctrl	= 0x0080;
 	keymodLalt	= 0x0100;
@@ -298,7 +301,7 @@ const (
 	keymodNum	= 0x1000;
 	keymodCaps	= 0x2000;
 	keymodMode	= 0x4000;
-	keymodReserved = 0x8000
+	keymodReserved	= 0x8000;
 )
 
 const (
@@ -306,19 +309,19 @@ const (
 	mouseButtonMiddle	= 2;
 	mouseButtonRight	= 3;
 	mouseScrollUp		= 4;
-	mouseScrollDown = 5
+	mouseScrollDown		= 5;
 )
 
 const (
 	mouseStateLeftButtonPressed	= 1;
 	mouseStateMiddleButtonPressed	= 2;
-	mouseStateRightButtonPressed = 4
+	mouseStateRightButtonPressed	= 4;
 )
 
 const (
 	activeMouse		= 1;	//  mouse leaving/entering
 	activeInputFocus	= 2;	// input focus lost/restored
-	activeApplication = 4   // application minimized/restored
+	activeApplication	= 4;	// application minimized/restored
 )
 
 const maxEventBytes = 64
@@ -369,13 +372,12 @@ type quitEvent struct {
 	EventType eventType;
 }
 
-type syncEvent struct {
-}
+type syncEvent struct{}
 
-type event interface {
-}
+type event interface{}
 
 type reader []byte
+
 func (r *reader) Read(p []byte) (n int, err os.Error) {
 	b := *r;
 	if len(b) == 0 && len(p) > 0 {
@@ -439,7 +441,7 @@ func (w *Window) readEvents() {
 		// log.Stdoutf("%#v\n", e);
 		switch buf[0] {
 		case eventExpose:
-			w.resizec <- true
+			w.resizec <- true;
 		case eventKeyDown:
 			w.kbdc <- int(ke.Key);
 		case eventKeyUp:
@@ -454,14 +456,14 @@ func (w *Window) readEvents() {
 			m.X = int(mbe.X);
 			m.Y = int(mbe.Y);
 			// TODO(rsc): Remove uint cast once 8g bug is fixed.
-			m.Buttons |= 1<<uint(mbe.Button-1);
+			m.Buttons |= 1<<uint(mbe.Button - 1);
 			m.Nsec = time.Nanoseconds();
 			_ = w.mousec <- m;
 		case eventMouseButtonUp:
 			m.X = int(mbe.X);
 			m.Y = int(mbe.Y);
 			// TODO(rsc): Remove uint cast once 8g bug is fixed.
-			m.Buttons &^= 1<<uint(mbe.Button-1);
+			m.Buttons &^= 1<<uint(mbe.Button - 1);
 			m.Nsec = time.Nanoseconds();
 			_ = w.mousec <- m;
 		case eventQuit:

src/pkg/exp/nacl/av/image.go

@@ -20,7 +20,7 @@ type Image struct {
 	Pixel	[][]Color;
 }
 
-var _ image.Image = (*Image)(nil);
+var _ image.Image = (*Image)(nil)
 
 func (m *Image) ColorModel() image.ColorModel {
 	return ColorModel;
@@ -62,18 +62,19 @@ func newImage(dx, dy int, linear []Color) *Image {
 // A Color represents a Native Client color value,
 // a 32-bit R, G, B, A value packed as 0xAARRGGBB.
 type Color uint32
+
 func (p Color) RGBA() (r, g, b, a uint32) {
 	x := uint32(p);
 	a = x>>24;
 	a |= a<<8;
 	a |= a<<16;
-	r = (x>>16) & 0xFF;
+	r = (x>>16)&0xFF;
 	r |= r<<8;
 	r |= r<<16;
-	g = (x>>8) & 0xFF;
+	g = (x>>8)&0xFF;
 	g |= g<<8;
 	g |= g<<16;
-	b = x & 0xFF;
+	b = x&0xFF;
 	b |= b<<8;
 	b |= b<<16;
 	return;
@@ -91,5 +92,4 @@ func toColor(color image.Color) image.Color {
 }
 
 // ColorModel is the color model corresponding to the Native Client Color.
-var ColorModel = image.ColorModelFunc(toColor);
-
+var ColorModel = image.ColorModelFunc(toColor)

src/pkg/exp/nacl/srpc/client.go

@@ -53,8 +53,8 @@ func NewClient(fd int) (c *Client, err os.Error) {
 	m := &msg{
 		protocol: protocol,
 		isReq: true,
-		Ret: []interface{}{ []byte(nil) },
-		Size: []int{ 4000 },
+		Ret: []interface{}{[]byte(nil)},
+		Size: []int{4000},
 	};
 	m.packRequest();
 	c.s.send(m);
@@ -72,7 +72,7 @@ func NewClient(fd int) (c *Client, err os.Error) {
 		if i < 0 {
 			continue;
 		}
-		c.service[string(line[0:i])] = srv{uint32(n), string(line[i+1:len(line)])};
+		c.service[string(line[0:i])] = srv{uint32(n), string(line[i+1 : len(line)])};
 	}
 
 	c.out = make(chan *msg);
@@ -159,11 +159,11 @@ func (r *RPC) Start(name string, arg []interface{}) {
 	for srv.fmt[i] != ':' {
 		i++;
 	}
-	fmt := srv.fmt[i+1:len(srv.fmt)];
+	fmt := srv.fmt[i+1 : len(srv.fmt)];
 
 	// Now the return prototypes.
-	m.Ret = make([]interface{}, len(fmt) - i);
-	m.Size = make([]int, len(fmt) - i);
+	m.Ret = make([]interface{}, len(fmt)-i);
+	m.Size = make([]int, len(fmt)-i);
 	for i := 0; i < len(fmt); i++ {
 		switch fmt[i] {
 		default:

src/pkg/exp/nacl/srpc/msg.go

@@ -17,8 +17,9 @@ import (
 
 // An Errno is an SRPC status code.
 type Errno uint32
+
 const (
-	OK Errno = 256 + iota;
+	OK	Errno	= 256+iota;
 	ErrBreak;
 	ErrMessageTruncated;
 	ErrNoMemory;
@@ -33,27 +34,27 @@ const (
 	ErrAppError;
 )
 
-var errstr = [...]string {
+var errstr = [...]string{
 	OK-OK: "ok",
 	ErrBreak-OK: "break",
-	ErrMessageTruncated-OK: "message truncated",
-	ErrNoMemory-OK: "out of memory",
-	ErrProtocolMismatch-OK: "protocol mismatch",
-	ErrBadRPCNumber-OK: "invalid RPC method number",
-	ErrBadArgType-OK: "unexpected argument type",
-	ErrTooFewArgs-OK: "too few arguments",
-	ErrTooManyArgs-OK: "too many arguments",
-	ErrInArgTypeMismatch-OK: "input argument type mismatch",
-	ErrOutArgTypeMismatch-OK: "output argument type mismatch",
-	ErrInternalError-OK: "internal error",
-	ErrAppError-OK: "application error",
+	ErrMessageTruncated - OK: "message truncated",
+	ErrNoMemory - OK: "out of memory",
+	ErrProtocolMismatch - OK: "protocol mismatch",
+	ErrBadRPCNumber - OK: "invalid RPC method number",
+	ErrBadArgType - OK: "unexpected argument type",
+	ErrTooFewArgs - OK: "too few arguments",
+	ErrTooManyArgs - OK: "too many arguments",
+	ErrInArgTypeMismatch - OK: "input argument type mismatch",
+	ErrOutArgTypeMismatch - OK: "output argument type mismatch",
+	ErrInternalError - OK: "internal error",
+	ErrAppError - OK: "application error",
 }
 
 func (e Errno) String() string {
 	if e < OK || int(e-OK) >= len(errstr) {
-		return "Errno(" + strconv.Itoa64(int64(e)) + ")"
+		return "Errno(" + strconv.Itoa64(int64(e)) + ")";
 	}
-	return errstr[e - OK];
+	return errstr[e-OK];
 }
 
 // A *msgHdr is the data argument to the imc_recvmsg
@@ -139,7 +140,6 @@ type msgSender struct {
 	fd	int;
 	hdr	msgHdr;
 	iov	iov;
-
 }
 
 func (s *msgSender) send(m *msg) os.Error {
@@ -222,8 +222,8 @@ func (m *msg) grow(n int) []byte {
 		bytes.Copy(a, m.wdata);
 		m.wdata = a;
 	}
-	m.wdata = m.wdata[0:i+n];
-	return m.wdata[i:i+n];
+	m.wdata = m.wdata[0 : i+n];
+	return m.wdata[i : i+n];
 }
 
 func (m *msg) wuint8(x uint8) {
@@ -529,4 +529,3 @@ func (m *msg) packResponse() {
 	m.wuint32(uint32(len(m.Ret)));
 	m.packValues(m.Ret);
 }
-

src/pkg/exp/nacl/srpc/server.go

@@ -22,7 +22,7 @@ import (
 // It reads arguments from arg, checks size for array limits,
 // writes return values to ret, and returns an Errno status code.
 type Handler interface {
-	Run(arg, ret []interface{}, size []int) Errno
+	Run(arg, ret []interface{}, size []int) Errno;
 }
 
 type method struct {
@@ -61,7 +61,7 @@ func Add(name, fmt string, handler Handler) {
 		}
 		rpcMethod = a;
 	}
-	rpcMethod = rpcMethod[0:n+1];
+	rpcMethod = rpcMethod[0 : n+1];
 	rpcMethod[n] = method{name, fmt, handler};
 }
 
@@ -175,7 +175,7 @@ func getFd() (fd int, err os.Error) {
 
 // Enabled returns true if SRPC is enabled in the Native Client runtime.
 func Enabled() bool {
-	_, err:= getFd();
+	_, err := getFd();
 	return err == nil;
 }
 
@@ -201,4 +201,3 @@ func (serviceDiscovery) Run(arg, ret []interface{}, size []int) Errno {
 func init() {
 	Add("service_discovery", ":C", serviceDiscovery{});
 }
-