summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2015-11-03 08:30:59 -0800
committerCarlos Martín Nieto <[email protected]>2015-11-03 08:30:59 -0800
commitf05a6a3384e4587cebda2de561515c043709bab6 (patch)
tree28ae03c68471506ebe2d9ecbe9ba697f43ea9331
parentc646a2eb304fc9ba41498dc4e5b76c44dfdb9b12 (diff)
parent714cd56c715d22e9759413783c9c4be0018193e0 (diff)
Merge pull request #269 from durin42/small-fixes
Small fixes I noticed while perusing the code.
-rw-r--r--config_test.go21
-rw-r--r--odb.go4
2 files changed, 17 insertions, 8 deletions
diff --git a/config_test.go b/config_test.go
index 8c2decc..fea8d8a 100644
--- a/config_test.go
+++ b/config_test.go
@@ -18,10 +18,22 @@ func setupConfig() (*Config, error) {
return nil, err
}
- c.SetString("foo.bar", "baz")
- c.SetBool("foo.bool", true)
- c.SetInt32("foo.int32", 32)
- c.SetInt64("foo.int64", 64)
+ err = c.SetString("foo.bar", "baz")
+ if err != nil {
+ return nil, err
+ }
+ 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
}
@@ -86,6 +98,7 @@ func TestConfigLookups(t *testing.T) {
if err != nil {
t.Errorf("Setup error: '%v'. Expected none\n", err)
+ return
}
defer c.Free()
diff --git a/odb.go b/odb.go
index be0870e..b15851f 100644
--- a/odb.go
+++ b/odb.go
@@ -11,7 +11,6 @@ import (
"reflect"
"runtime"
"unsafe"
- "fmt"
)
type Odb struct {
@@ -107,9 +106,7 @@ func odbForEachCb(id *C.git_oid, handle unsafe.Pointer) int {
}
err := data.callback(newOidFromC(id))
- fmt.Println("err %v", err)
if err != nil {
- fmt.Println("returning EUSER")
data.err = err
return C.GIT_EUSER
}
@@ -130,7 +127,6 @@ func (v *Odb) ForEach(callback OdbForEachCallback) error {
defer pointerHandles.Untrack(handle)
ret := C._go_git_odb_foreach(v.ptr, handle)
- fmt.Println("ret %v", ret);
if ret == C.GIT_EUSER {
return data.err
} else if ret < 0 {