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

explicit returns

This commit is contained in:
Aidan Nulman 2014-04-03 16:39:21 -04:00
parent 9299214e57
commit b5e60dc106
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
odb.go
View File

@ -31,12 +31,12 @@ func NewOdb() (odb *Odb, err error) {
} }
runtime.SetFinalizer(odb, (*Odb).Free) runtime.SetFinalizer(odb, (*Odb).Free)
return return odb, nil
} }
func NewOdbBackendFromC(ptr *C.git_odb_backend) (backend *OdbBackend) { func NewOdbBackendFromC(ptr *C.git_odb_backend) (backend *OdbBackend) {
backend = &OdbBackend{ptr} backend = &OdbBackend{ptr}
return return backend
} }
func (v *Odb) AddBackend(backend *OdbBackend, priority int) (err error) { func (v *Odb) AddBackend(backend *OdbBackend, priority int) (err error) {
@ -63,10 +63,10 @@ func (v *Odb) Write(data []byte, otype ObjectType) (oid *Oid, err error) {
ret := C.git_odb_write(oid.toC(), v.ptr, unsafe.Pointer(hdr.Data), C.size_t(hdr.Len), C.git_otype(otype)) ret := C.git_odb_write(oid.toC(), v.ptr, unsafe.Pointer(hdr.Data), C.size_t(hdr.Len), C.git_otype(otype))
if ret < 0 { if ret < 0 {
err = LastError() return nil, LastError()
} }
return return oid, nil
} }
func (v *Odb) Read(oid *Oid) (obj *OdbObject, err error) { func (v *Odb) Read(oid *Oid) (obj *OdbObject, err error) {
@ -81,7 +81,7 @@ func (v *Odb) Read(oid *Oid) (obj *OdbObject, err error) {
} }
runtime.SetFinalizer(obj, (*OdbObject).Free) runtime.SetFinalizer(obj, (*OdbObject).Free)
return return obj, nil
} }
//export odbForEachCb //export odbForEachCb
@ -121,9 +121,9 @@ func (v *Odb) Hash(data []byte, otype ObjectType) (oid *Oid, err error) {
ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype)); ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype));
if ret < 0 { if ret < 0 {
err = LastError() return nil, LastError()
} }
return return oid, nil
} }
// NewReadStream opens a read stream from the ODB. Reading from it will give you the // NewReadStream opens a read stream from the ODB. Reading from it will give you the

8
refdb.go
View File

@ -28,21 +28,21 @@ func (v *Repository) NewRefdb() (refdb *Refdb, err error) {
} }
runtime.SetFinalizer(refdb, (*Refdb).Free) runtime.SetFinalizer(refdb, (*Refdb).Free)
return return refdb, nil
} }
func NewRefdbBackendFromC(ptr *C.git_refdb_backend) (backend *RefdbBackend) { func NewRefdbBackendFromC(ptr *C.git_refdb_backend) (backend *RefdbBackend) {
backend = &RefdbBackend{ptr} backend = &RefdbBackend{ptr}
return return backend
} }
func (v *Refdb) SetBackend(backend *RefdbBackend) (err error) { func (v *Refdb) SetBackend(backend *RefdbBackend) (err error) {
ret := C.git_refdb_set_backend(v.ptr, backend.ptr) ret := C.git_refdb_set_backend(v.ptr, backend.ptr)
if ret < 0 { if ret < 0 {
backend.Free() backend.Free()
err = LastError() return LastError()
} }
return return nil
} }
func (v *RefdbBackend) Free() { func (v *RefdbBackend) Free() {

5
repository.go
View File

@ -60,12 +60,11 @@ func NewRepositoryWrapOdb(odb *Odb) (repo *Repository, err error) {
} }
runtime.SetFinalizer(repo, (*Repository).Free) runtime.SetFinalizer(repo, (*Repository).Free)
return return repo, nil
} }
func (v *Repository) SetRefdb(refdb *Refdb) { func (v *Repository) SetRefdb(refdb *Refdb) {
C.git_repository_set_refdb(v.ptr, refdb.ptr) C.git_repository_set_refdb(v.ptr, refdb.ptr)
return
} }
func (v *Repository) Free() { func (v *Repository) Free() {
@ -294,7 +293,7 @@ func (v *Repository) Odb() (odb *Odb, err error) {
} }
runtime.SetFinalizer(odb, (*Odb).Free) runtime.SetFinalizer(odb, (*Odb).Free)
return return odb, nil
} }
func (repo *Repository) Path() string { func (repo *Repository) Path() string {