libgo: Update to weekly 2011-11-09.

[pf3gnuchains/gcc-fork.git] / libgo / go / mime / multipart / multipart.go

diff --git a/libgo/go/mime/multipart/multipart.go b/libgo/go/mime/multipart/multipart.go
index 2533bd3..64a11e6 100644 (file)
--- a/libgo/go/mime/multipart/multipart.go
+++ b/libgo/go/mime/multipart/multipart.go
@@ -20,7 +20,6 @@ import (
        "io/ioutil"
        "mime"
        "net/textproto"
-       "os"
 )
 
 // TODO(bradfitz): inline these once the compiler can inline them in
@@ -69,8 +68,9 @@ func (p *Part) FileName() string {
 
 func (p *Part) parseContentDisposition() {
        v := p.Header.Get("Content-Disposition")
-       p.disposition, p.dispositionParams = mime.ParseMediaType(v)
-       if p.dispositionParams == nil {
+       var err error
+       p.disposition, p.dispositionParams, err = mime.ParseMediaType(v)
+       if err != nil {
                p.dispositionParams = emptyParams
        }
 }
@@ -89,7 +89,7 @@ func NewReader(reader io.Reader, boundary string) *Reader {
        }
 }
 
-func newPart(mr *Reader) (*Part, os.Error) {
+func newPart(mr *Reader) (*Part, error) {
        bp := &Part{
                Header: make(map[string][]string),
                mr:     mr,
@@ -101,7 +101,7 @@ func newPart(mr *Reader) (*Part, os.Error) {
        return bp, nil
 }
 
-func (bp *Part) populateHeaders() os.Error {
+func (bp *Part) populateHeaders() error {
        r := textproto.NewReader(bp.mr.bufReader)
        header, err := r.ReadMIMEHeader()
        if err == nil {
@@ -112,14 +112,14 @@ func (bp *Part) populateHeaders() os.Error {
 
 // Read reads the body of a part, after its headers and before the
 // next part (if any) begins.
-func (bp *Part) Read(p []byte) (n int, err os.Error) {
+func (bp *Part) Read(p []byte) (n int, err error) {
        if bp.buffer.Len() >= len(p) {
                // Internal buffer of unconsumed data is large enough for
                // the read request.  No need to parse more at the moment.
                return bp.buffer.Read(p)
        }
        peek, err := bp.mr.bufReader.Peek(4096) // TODO(bradfitz): add buffer size accessor
-       unexpectedEof := err == os.EOF
+       unexpectedEof := err == io.EOF
        if err != nil && !unexpectedEof {
                return 0, fmt.Errorf("multipart: Part Read: %v", err)
        }
@@ -145,12 +145,12 @@ func (bp *Part) Read(p []byte) (n int, err os.Error) {
                return 0, io.ErrUnexpectedEOF
        }
        if nCopy > 0 {
-               if _, err := io.Copyn(bp.buffer, bp.mr.bufReader, int64(nCopy)); err != nil {
+               if _, err := io.CopyN(bp.buffer, bp.mr.bufReader, int64(nCopy)); err != nil {
                        return 0, err
                }
        }
        n, err = bp.buffer.Read(p)
-       if err == os.EOF && !foundBoundary {
+       if err == io.EOF && !foundBoundary {
                // If the boundary hasn't been reached there's more to
                // read, so don't pass through an EOF from the buffer
                err = nil
@@ -158,7 +158,7 @@ func (bp *Part) Read(p []byte) (n int, err os.Error) {
        return
 }
 
-func (bp *Part) Close() os.Error {
+func (bp *Part) Close() error {
        io.Copy(ioutil.Discard, bp)
        return nil
 }
@@ -176,8 +176,8 @@ type Reader struct {
 }
 
 // NextPart returns the next part in the multipart or an error.
-// When there are no more parts, the error os.EOF is returned.
-func (mr *Reader) NextPart() (*Part, os.Error) {
+// When there are no more parts, the error io.EOF is returned.
+func (mr *Reader) NextPart() (*Part, error) {
        if mr.currentPart != nil {
                mr.currentPart.Close()
        }
@@ -201,7 +201,7 @@ func (mr *Reader) NextPart() (*Part, os.Error) {
 
                if hasPrefixThenNewline(line, mr.dashBoundaryDash) {
                        // Expected EOF
-                       return nil, os.EOF
+                       return nil, io.EOF
                }
 
                if expectNewPart {