jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Merge pull request #67 from jezell/chunk-create-fix 

fix chunk create return values
This commit is contained in:
Carlos Martín Nieto 2014-03-17 16:04:05 +01:00
parent 1cf8117814 663c2a69c9
commit dbdbb4b0d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blob.go
View File

@ -55,13 +55,13 @@ func blobChunkCb(buffer *C.char, maxLen C.size_t, payload unsafe.Pointer) int {
data := (*BlobCallbackData)(payload) data := (*BlobCallbackData)(payload)
goBuf, err := data.Callback(int(maxLen)) goBuf, err := data.Callback(int(maxLen))
if err == io.EOF { if err == io.EOF {
return 1 return 0
} else if err != nil { } else if err != nil {
data.Error = err data.Error = err
return -1 return -1
} }
C.memcpy(unsafe.Pointer(buffer), unsafe.Pointer(&goBuf), C.size_t(len(goBuf))) C.memcpy(unsafe.Pointer(buffer), unsafe.Pointer(&goBuf[0]), C.size_t(len(goBuf)))
return 0 return len(goBuf)
} }
func (repo *Repository) CreateBlobFromChunks(hintPath string, callback BlobChunkCallback) (*Oid, error) { func (repo *Repository) CreateBlobFromChunks(hintPath string, callback BlobChunkCallback) (*Oid, error) {