Update prebuilts to go1.10 ab/4625579
Test: m -j blueprint_tools
Change-Id: I24caea588e0801ed52e256b2076e3359190c2525
diff --git a/src/time/sys_plan9.go b/src/time/sys_plan9.go
index 9086a6e..b7fba08 100644
--- a/src/time/sys_plan9.go
+++ b/src/time/sys_plan9.go
@@ -16,36 +16,6 @@
// cannot predict pid, don't want to kill group
}
-// readFile reads and returns the content of the named file.
-// It is a trivial implementation of ioutil.ReadFile, reimplemented
-// here to avoid depending on io/ioutil or os.
-// It returns an error if name exceeds maxFileSize bytes.
-func readFile(name string) ([]byte, error) {
- f, err := syscall.Open(name, syscall.O_RDONLY)
- if err != nil {
- return nil, err
- }
- defer syscall.Close(f)
- var (
- buf [4096]byte
- ret []byte
- n int
- )
- for {
- n, err = syscall.Read(f, buf[:])
- if n > 0 {
- ret = append(ret, buf[:n]...)
- }
- if n == 0 || err != nil {
- break
- }
- if len(ret) > maxFileSize {
- return nil, fileSizeError(name)
- }
- }
- return ret, err
-}
-
func open(name string) (uintptr, error) {
fd, err := syscall.Open(name, syscall.O_RDONLY)
if err != nil {
@@ -54,6 +24,10 @@
return uintptr(fd), nil
}
+func read(fd uintptr, buf []byte) (int, error) {
+ return syscall.Read(int(fd), buf)
+}
+
func closefd(fd uintptr) {
syscall.Close(int(fd))
}