Fix
* git2go/blob.go:63: cannot use _Ctype_size_t(len(goBuf)) (type C.size_t) as type C.ulong in function argument * git2go/merge.go:169 git_merge_analysis: now have five arguments
This commit is contained in:
parent
8a73c75f1a
commit
64e9ef8863
2
blob.go
2
blob.go
|
@ -61,7 +61,7 @@ func blobChunkCb(buffer *C.char, maxLen C.size_t, payload unsafe.Pointer) int {
|
||||||
data.Error = err
|
data.Error = err
|
||||||
return -1
|
return -1
|
||||||
}
|
}
|
||||||
C.memcpy(unsafe.Pointer(buffer), unsafe.Pointer(&goBuf[0]), C.size_t(len(goBuf)))
|
C.memcpy(unsafe.Pointer(buffer), unsafe.Pointer(&goBuf[0]), C.ulong(len(goBuf)))
|
||||||
return len(goBuf)
|
return len(goBuf)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
merge.go
2
merge.go
|
@ -166,7 +166,7 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro
|
||||||
}
|
}
|
||||||
ptr := unsafe.Pointer(&gmerge_head_array[0])
|
ptr := unsafe.Pointer(&gmerge_head_array[0])
|
||||||
var analysis C.git_merge_analysis_t
|
var analysis C.git_merge_analysis_t
|
||||||
err := C.git_merge_analysis(&analysis, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads)))
|
err := C.git_merge_analysis(&analysis, nil, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads)))
|
||||||
if err < 0 {
|
if err < 0 {
|
||||||
return MergeAnalysisNone, MakeGitError(err)
|
return MergeAnalysisNone, MakeGitError(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue