diff options
Diffstat (limited to 'libgo/go/archive/zip/struct.go')
| -rw-r--r-- | libgo/go/archive/zip/struct.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libgo/go/archive/zip/struct.go b/libgo/go/archive/zip/struct.go index 4f9f599a148..b862b5a6acb 100644 --- a/libgo/go/archive/zip/struct.go +++ b/libgo/go/archive/zip/struct.go @@ -11,7 +11,7 @@ This package does not support ZIP64 or disk spanning. */ package zip -import "os" +import "errors" import "time" // Compression methods. @@ -60,9 +60,9 @@ type directoryEnd struct { comment string } -func recoverError(errp *os.Error) { +func recoverError(errp *error) { if e := recover(); e != nil { - if err, ok := e.(os.Error); ok { + if err, ok := e.(error); ok { *errp = err return } @@ -96,11 +96,11 @@ func (h *FileHeader) Mtime_ns() int64 { // Mode returns the permission and mode bits for the FileHeader. // An error is returned in case the information is not available. -func (h *FileHeader) Mode() (mode uint32, err os.Error) { +func (h *FileHeader) Mode() (mode uint32, err error) { if h.CreatorVersion>>8 == creatorUnix { return h.ExternalAttrs >> 16, nil } - return 0, os.NewError("file mode not available") + return 0, errors.New("file mode not available") } // SetMode changes the permission and mode bits for the FileHeader. |