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

Merge pull request #269 from durin42/small-fixes 

Small fixes I noticed while perusing the code.
This commit is contained in:
Carlos Martín Nieto 2015-11-03 08:30:59 -08:00
parent c646a2eb30 714cd56c71
commit f05a6a3384
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config_test.go
View File

@ -18,10 +18,22 @@ func setupConfig() (*Config, error) {
return nil, err return nil, err
} }
c.SetString("foo.bar", "baz") err = c.SetString("foo.bar", "baz")
c.SetBool("foo.bool", true) if err != nil {
c.SetInt32("foo.int32", 32) return nil, err
c.SetInt64("foo.int64", 64) }
err = c.SetBool("foo.bool", true)
if err != nil {
return nil, err
}
err = c.SetInt32("foo.int32", 32)
if err != nil {
return nil, err
}
err = c.SetInt64("foo.int64", 64)
if err != nil {
return nil, err
}
return c, err return c, err
} }
@ -86,6 +98,7 @@ func TestConfigLookups(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Setup error: '%v'. Expected none\n", err) t.Errorf("Setup error: '%v'. Expected none\n", err)
return
} }
defer c.Free() defer c.Free()

4
odb.go
View File

@ -11,7 +11,6 @@ import (
"reflect" "reflect"
"runtime" "runtime"
"unsafe" "unsafe"
"fmt"
) )
type Odb struct { type Odb struct {
@ -107,9 +106,7 @@ func odbForEachCb(id *C.git_oid, handle unsafe.Pointer) int {
} }
err := data.callback(newOidFromC(id)) err := data.callback(newOidFromC(id))
fmt.Println("err %v", err)
if err != nil { if err != nil {
fmt.Println("returning EUSER")
data.err = err data.err = err
return C.GIT_EUSER return C.GIT_EUSER
} }
@ -130,7 +127,6 @@ func (v *Odb) ForEach(callback OdbForEachCallback) error {
defer pointerHandles.Untrack(handle) defer pointerHandles.Untrack(handle)
ret := C._go_git_odb_foreach(v.ptr, handle) ret := C._go_git_odb_foreach(v.ptr, handle)
fmt.Println("ret %v", ret);
if ret == C.GIT_EUSER { if ret == C.GIT_EUSER {
return data.err return data.err
} else if ret < 0 { } else if ret < 0 {