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

Convert the rest of the errors

This commit is contained in:
Carlos Martín Nieto 2014-02-26 16:14:31 +01:00
parent 499f52a354
commit 00ea11691b
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config.go
View File

@ -61,7 +61,7 @@ func NewConfig() (*Config, error) {
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
if ret := C.git_config_new(&config.ptr); ret < 0 { if ret := C.git_config_new(&config.ptr); ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return config, nil return config, nil
@ -78,7 +78,7 @@ func (c *Config) AddFile(path string, level ConfigLevel, force bool) error {
ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force)) ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force))
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -142,7 +142,7 @@ func (c *Config) LookupBool(name string) (bool, error) {
ret := C.git_config_get_bool(&out, c.ptr, cname) ret := C.git_config_get_bool(&out, c.ptr, cname)
if ret < 0 { if ret < 0 {
return false, LastError() return false, MakeGitError(ret)
} }
return out != 0, nil return out != 0, nil
@ -167,7 +167,7 @@ func (c *Config) NewMultivarIterator(name, regexp string) (*ConfigIterator, erro
ret := C.git_config_multivar_iterator_new(&iter.ptr, c.ptr, cname, cregexp) ret := C.git_config_multivar_iterator_new(&iter.ptr, c.ptr, cname, cregexp)
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(iter, (*ConfigIterator).Free) runtime.SetFinalizer(iter, (*ConfigIterator).Free)
@ -184,7 +184,7 @@ func (c *Config) NewIterator() (*ConfigIterator, error) {
ret := C.git_config_iterator_new(&iter.ptr, c.ptr) ret := C.git_config_iterator_new(&iter.ptr, c.ptr)
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return iter, nil return iter, nil
@ -202,7 +202,7 @@ func (c *Config) NewIteratorGlob(regexp string) (*ConfigIterator, error) {
ret := C.git_config_iterator_glob_new(&iter.ptr, c.ptr, cregexp) ret := C.git_config_iterator_glob_new(&iter.ptr, c.ptr, cregexp)
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return iter, nil return iter, nil
@ -237,7 +237,7 @@ func (c *Config) SetInt32(name string, value int32) (err error) {
ret := C.git_config_set_int32(c.ptr, cname, C.int32_t(value)) ret := C.git_config_set_int32(c.ptr, cname, C.int32_t(value))
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -252,7 +252,7 @@ func (c *Config) SetInt64(name string, value int64) (err error) {
ret := C.git_config_set_int64(c.ptr, cname, C.int64_t(value)) ret := C.git_config_set_int64(c.ptr, cname, C.int64_t(value))
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -267,7 +267,7 @@ func (c *Config) SetBool(name string, value bool) (err error) {
ret := C.git_config_set_bool(c.ptr, cname, cbool(value)) ret := C.git_config_set_bool(c.ptr, cname, cbool(value))
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -288,7 +288,7 @@ func (c *Config) SetMultivar(name, regexp, value string) (err error) {
ret := C.git_config_set_multivar(c.ptr, cname, cregexp, cvalue) ret := C.git_config_set_multivar(c.ptr, cname, cregexp, cvalue)
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -304,7 +304,7 @@ func (c *Config) Delete(name string) error {
ret := C.git_config_delete_entry(c.ptr, cname) ret := C.git_config_delete_entry(c.ptr, cname)
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -319,7 +319,7 @@ func (c *Config) OpenLevel(parent *Config, level ConfigLevel) (*Config, error) {
ret := C.git_config_open_level(&config.ptr, parent.ptr, C.git_config_level_t(level)) ret := C.git_config_open_level(&config.ptr, parent.ptr, C.git_config_level_t(level))
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return config, nil return config, nil
@ -336,7 +336,7 @@ func OpenOndisk(parent *Config, path string) (*Config, error) {
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
if ret := C.git_config_open_ondisk(&config.ptr, cpath); ret < 0 { if ret := C.git_config_open_ondisk(&config.ptr, cpath); ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return config, nil return config, nil
@ -348,7 +348,7 @@ func (c *Config) Refresh() error {
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
if ret := C.git_config_refresh(c.ptr); ret < 0 { if ret := C.git_config_refresh(c.ptr); ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil
@ -364,7 +364,7 @@ func (iter *ConfigIterator) Next() (*ConfigEntry, error) {
ret := C.git_config_next(&centry, iter.ptr) ret := C.git_config_next(&centry, iter.ptr)
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return newConfigEntryFromC(centry), nil return newConfigEntryFromC(centry), nil

2
index.go
View File

@ -68,7 +68,7 @@ func (v *Index) Write() (error) {
ret := C.git_index_write(v.ptr) ret := C.git_index_write(v.ptr)
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil

12
odb.go
View File

@ -90,7 +90,7 @@ 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() err = MakeGitError(ret)
} }
return return
} }
@ -101,7 +101,7 @@ func (v *Odb) NewReadStream(id *Oid) (*OdbReadStream, error) {
stream := new(OdbReadStream) stream := new(OdbReadStream)
ret := C.git_odb_open_rstream(&stream.ptr, v.ptr, id.toC()) ret := C.git_odb_open_rstream(&stream.ptr, v.ptr, id.toC())
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(stream, (*OdbReadStream).Free) runtime.SetFinalizer(stream, (*OdbReadStream).Free)
@ -115,7 +115,7 @@ func (v *Odb) NewWriteStream(size int, otype ObjectType) (*OdbWriteStream, error
stream := new(OdbWriteStream) stream := new(OdbWriteStream)
ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.size_t(size), C.git_otype(otype)) ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.size_t(size), C.git_otype(otype))
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
runtime.SetFinalizer(stream, (*OdbWriteStream).Free) runtime.SetFinalizer(stream, (*OdbWriteStream).Free)
@ -164,7 +164,7 @@ func (stream *OdbReadStream) Read(data []byte) (int, error) {
size := C.size_t(header.Cap) size := C.size_t(header.Cap)
ret := C.git_odb_stream_read(stream.ptr, ptr, size) ret := C.git_odb_stream_read(stream.ptr, ptr, size)
if ret < 0 { if ret < 0 {
return 0, LastError() return 0, MakeGitError(ret)
} }
header.Len = int(ret) header.Len = int(ret)
@ -196,7 +196,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
ret := C.git_odb_stream_write(stream.ptr, ptr, size) ret := C.git_odb_stream_write(stream.ptr, ptr, size)
if ret < 0 { if ret < 0 {
return 0, LastError() return 0, MakeGitError(ret)
} }
return len(data), nil return len(data), nil
@ -207,7 +207,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
func (stream *OdbWriteStream) Close() error { func (stream *OdbWriteStream) Close() error {
ret := C.git_odb_stream_finalize_write(stream.Id.toC(), stream.ptr) ret := C.git_odb_stream_finalize_write(stream.Id.toC(), stream.ptr)
if ret < 0 { if ret < 0 {
return LastError() return MakeGitError(ret)
} }
return nil return nil

2
reference.go
View File

@ -247,7 +247,7 @@ func (v *ReferenceIterator) Next() (*Reference, error) {
return nil, ErrIterOver return nil, ErrIterOver
} }
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return newReferenceFromC(ptr), nil return newReferenceFromC(ptr), nil

2
submodule.go
View File

@ -247,7 +247,7 @@ func (sub *Submodule) SetFetchRecurseSubmodules(recurse SubmoduleRecurse) error
ret := C.git_submodule_set_fetch_recurse_submodules(sub.ptr, C.git_submodule_recurse_t(recurse)) ret := C.git_submodule_set_fetch_recurse_submodules(sub.ptr, C.git_submodule_recurse_t(recurse))
if ret < 0 { if ret < 0 {
return MakeGitError(ret) return MakeGitError(C.int(ret))
} }
return nil return nil
} }

2
tree.go
View File

@ -67,7 +67,7 @@ func (t Tree) EntryByPath(path string) (*TreeEntry, error) {
ret := C.git_tree_entry_bypath(&entry, t.ptr, cpath) ret := C.git_tree_entry_bypath(&entry, t.ptr, cpath)
if ret < 0 { if ret < 0 {
return nil, LastError() return nil, MakeGitError(ret)
} }
return newTreeEntry(entry), nil return newTreeEntry(entry), nil