diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-03 02:17:34 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-12-03 02:17:34 +0000 |
| commit | 2fd401c8f190f1fe43e51a7f726f6ed6119a1f96 (patch) | |
| tree | 7f76eff391f37fe6467ff4ffbc0c582c9959ea30 /libgo/go/patch/apply.go | |
| parent | 02e9018f1616b23f1276151797216717b3564202 (diff) | |
| download | gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.zip gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.gz gcc-2fd401c8f190f1fe43e51a7f726f6ed6119a1f96.tar.bz2 | |
libgo: Update to weekly.2011-11-02.
From-SVN: r181964
Diffstat (limited to 'libgo/go/patch/apply.go')
| -rw-r--r-- | libgo/go/patch/apply.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/patch/apply.go b/libgo/go/patch/apply.go index 0dd9080..7c4f4ad 100644 --- a/libgo/go/patch/apply.go +++ b/libgo/go/patch/apply.go @@ -23,7 +23,7 @@ type Op struct { // The function readFile should return the contents of the named file. // Typically this function will be io.ReadFile. // -func (set *Set) Apply(readFile func(string) ([]byte, os.Error)) ([]Op, os.Error) { +func (set *Set) Apply(readFile func(string) ([]byte, error)) ([]Op, error) { op := make([]Op, len(set.File)) for i, f := range set.File { @@ -36,7 +36,7 @@ func (set *Set) Apply(readFile func(string) ([]byte, os.Error)) ([]Op, os.Error) // Clients assume o.Data == nil means no data diff. // Start with a non-nil data. var old []byte = make([]byte, 0) // not nil - var err os.Error + var err error if f.Src != "" { old, err = readFile(f.Src) if err != nil { |