summaryrefslogtreecommitdiff
path: root/src/pkg/patch/apply.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/pkg/patch/apply.go')
-rw-r--r--src/pkg/patch/apply.go32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/pkg/patch/apply.go b/src/pkg/patch/apply.go
index fc82f93cc..0dd9080bf 100644
--- a/src/pkg/patch/apply.go
+++ b/src/pkg/patch/apply.go
@@ -8,11 +8,11 @@ import "os"
// An Op is a single operation to execute to apply a patch.
type Op struct {
- Verb Verb; // action
- Src string; // source file
- Dst string; // destination file
- Mode int; // mode for destination (if non-zero)
- Data []byte; // data for destination (if non-nil)
+ Verb Verb // action
+ Src string // source file
+ Dst string // destination file
+ Mode int // mode for destination (if non-zero)
+ Data []byte // data for destination (if non-nil)
}
// Apply applies the patch set to the files named in the patch set,
@@ -24,31 +24,31 @@ type Op struct {
// Typically this function will be io.ReadFile.
//
func (set *Set) Apply(readFile func(string) ([]byte, os.Error)) ([]Op, os.Error) {
- op := make([]Op, len(set.File));
+ op := make([]Op, len(set.File))
for i, f := range set.File {
- o := &op[i];
- o.Verb = f.Verb;
- o.Src = f.Src;
- o.Dst = f.Dst;
- o.Mode = f.NewMode;
+ o := &op[i]
+ o.Verb = f.Verb
+ o.Src = f.Src
+ o.Dst = f.Dst
+ o.Mode = f.NewMode
if f.Diff != NoDiff || o.Verb != Edit {
// 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 old []byte = make([]byte, 0) // not nil
+ var err os.Error
if f.Src != "" {
- old, err = readFile(f.Src);
+ old, err = readFile(f.Src)
if err != nil {
return nil, &os.PathError{string(f.Verb), f.Src, err}
}
}
- o.Data, err = f.Diff.Apply(old);
+ o.Data, err = f.Diff.Apply(old)
if err != nil {
return nil, &os.PathError{string(f.Verb), f.Src, err}
}
}
}
- return op, nil;
+ return op, nil
}