Do not embed callbacks in struct and give them more appropriate type names

This commit is contained in:
Michael Boulton 2020-08-17 08:02:18 +01:00
parent 87433ff8a8
commit ad65e109e4
No known key found for this signature in database
GPG Key ID: 8A62CA0BE2E0197E
1 changed files with 7 additions and 7 deletions

14
diff.go
View File

@ -850,17 +850,17 @@ func DiffBlobs(oldBlob *Blob, oldAsPath string, newBlob *Blob, newAsPath string,
return nil
}
type ApplyHunkCallback func(*DiffHunk) (apply bool, err error)
type ApplyDeltaCallback func(*DiffDelta) (apply bool, err error)
type ApplyHunkCb func(*DiffHunk) (apply bool, err error)
type ApplyDeltaCb func(*DiffDelta) (apply bool, err error)
// ApplyOptions has 2 callbacks that are called for hunks or deltas
// If these functions return an error, abort the apply process immediately.
// If the first resutnr value is true, the delta/hunk will be applied. If it is false, the delta/hunk will not be applied. In either case, the rest of the apply process will continue.
// If the first return value is true, the delta/hunk will be applied. If it is false, the delta/hunk will not be applied. In either case, the rest of the apply process will continue.
type ApplyOptions struct {
Version uint
ApplyHunkCallback
ApplyDeltaCallback
Flags uint
Version uint
ApplyHunkCallback ApplyHunkCb
ApplyDeltaCallback ApplyDeltaCb
Flags uint
}
//export hunkApplyCallback