Skip to content

Commit 00ea116

Browse files
committed
Convert the rest of the errors
1 parent 499f52a commit 00ea116

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

config.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func NewConfig() (*Config, error) {
6161
defer runtime.UnlockOSThread()
6262

6363
if ret := C.git_config_new(&config.ptr); ret < 0 {
64-
return nil, LastError()
64+
return nil, MakeGitError(ret)
6565
}
6666

6767
return config, nil
@@ -78,7 +78,7 @@ func (c *Config) AddFile(path string, level ConfigLevel, force bool) error {
7878

7979
ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force))
8080
if ret < 0 {
81-
return LastError()
81+
return MakeGitError(ret)
8282
}
8383

8484
return nil
@@ -142,7 +142,7 @@ func (c *Config) LookupBool(name string) (bool, error) {
142142

143143
ret := C.git_config_get_bool(&out, c.ptr, cname)
144144
if ret < 0 {
145-
return false, LastError()
145+
return false, MakeGitError(ret)
146146
}
147147

148148
return out != 0, nil
@@ -167,7 +167,7 @@ func (c *Config) NewMultivarIterator(name, regexp string) (*ConfigIterator, erro
167167

168168
ret := C.git_config_multivar_iterator_new(&iter.ptr, c.ptr, cname, cregexp)
169169
if ret < 0 {
170-
return nil, LastError()
170+
return nil, MakeGitError(ret)
171171
}
172172

173173
runtime.SetFinalizer(iter, (*ConfigIterator).Free)
@@ -184,7 +184,7 @@ func (c *Config) NewIterator() (*ConfigIterator, error) {
184184

185185
ret := C.git_config_iterator_new(&iter.ptr, c.ptr)
186186
if ret < 0 {
187-
return nil, LastError()
187+
return nil, MakeGitError(ret)
188188
}
189189

190190
return iter, nil
@@ -202,7 +202,7 @@ func (c *Config) NewIteratorGlob(regexp string) (*ConfigIterator, error) {
202202

203203
ret := C.git_config_iterator_glob_new(&iter.ptr, c.ptr, cregexp)
204204
if ret < 0 {
205-
return nil, LastError()
205+
return nil, MakeGitError(ret)
206206
}
207207

208208
return iter, nil
@@ -237,7 +237,7 @@ func (c *Config) SetInt32(name string, value int32) (err error) {
237237

238238
ret := C.git_config_set_int32(c.ptr, cname, C.int32_t(value))
239239
if ret < 0 {
240-
return LastError()
240+
return MakeGitError(ret)
241241
}
242242

243243
return nil
@@ -252,7 +252,7 @@ func (c *Config) SetInt64(name string, value int64) (err error) {
252252

253253
ret := C.git_config_set_int64(c.ptr, cname, C.int64_t(value))
254254
if ret < 0 {
255-
return LastError()
255+
return MakeGitError(ret)
256256
}
257257

258258
return nil
@@ -267,7 +267,7 @@ func (c *Config) SetBool(name string, value bool) (err error) {
267267

268268
ret := C.git_config_set_bool(c.ptr, cname, cbool(value))
269269
if ret < 0 {
270-
return LastError()
270+
return MakeGitError(ret)
271271
}
272272

273273
return nil
@@ -288,7 +288,7 @@ func (c *Config) SetMultivar(name, regexp, value string) (err error) {
288288

289289
ret := C.git_config_set_multivar(c.ptr, cname, cregexp, cvalue)
290290
if ret < 0 {
291-
return LastError()
291+
return MakeGitError(ret)
292292
}
293293

294294
return nil
@@ -304,7 +304,7 @@ func (c *Config) Delete(name string) error {
304304
ret := C.git_config_delete_entry(c.ptr, cname)
305305

306306
if ret < 0 {
307-
return LastError()
307+
return MakeGitError(ret)
308308
}
309309

310310
return nil
@@ -319,7 +319,7 @@ func (c *Config) OpenLevel(parent *Config, level ConfigLevel) (*Config, error) {
319319

320320
ret := C.git_config_open_level(&config.ptr, parent.ptr, C.git_config_level_t(level))
321321
if ret < 0 {
322-
return nil, LastError()
322+
return nil, MakeGitError(ret)
323323
}
324324

325325
return config, nil
@@ -336,7 +336,7 @@ func OpenOndisk(parent *Config, path string) (*Config, error) {
336336
defer runtime.UnlockOSThread()
337337

338338
if ret := C.git_config_open_ondisk(&config.ptr, cpath); ret < 0 {
339-
return nil, LastError()
339+
return nil, MakeGitError(ret)
340340
}
341341

342342
return config, nil
@@ -348,7 +348,7 @@ func (c *Config) Refresh() error {
348348
defer runtime.UnlockOSThread()
349349

350350
if ret := C.git_config_refresh(c.ptr); ret < 0 {
351-
return LastError()
351+
return MakeGitError(ret)
352352
}
353353

354354
return nil
@@ -364,7 +364,7 @@ func (iter *ConfigIterator) Next() (*ConfigEntry, error) {
364364

365365
ret := C.git_config_next(&centry, iter.ptr)
366366
if ret < 0 {
367-
return nil, LastError()
367+
return nil, MakeGitError(ret)
368368
}
369369

370370
return newConfigEntryFromC(centry), nil

index.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (v *Index) Write() (error) {
6868

6969
ret := C.git_index_write(v.ptr)
7070
if ret < 0 {
71-
return LastError()
71+
return MakeGitError(ret)
7272
}
7373

7474
return nil

odb.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (v *Odb) Hash(data []byte, otype ObjectType) (oid *Oid, err error) {
9090

9191
ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype));
9292
if ret < 0 {
93-
err = LastError()
93+
err = MakeGitError(ret)
9494
}
9595
return
9696
}
@@ -101,7 +101,7 @@ func (v *Odb) NewReadStream(id *Oid) (*OdbReadStream, error) {
101101
stream := new(OdbReadStream)
102102
ret := C.git_odb_open_rstream(&stream.ptr, v.ptr, id.toC())
103103
if ret < 0 {
104-
return nil, LastError()
104+
return nil, MakeGitError(ret)
105105
}
106106

107107
runtime.SetFinalizer(stream, (*OdbReadStream).Free)
@@ -115,7 +115,7 @@ func (v *Odb) NewWriteStream(size int, otype ObjectType) (*OdbWriteStream, error
115115
stream := new(OdbWriteStream)
116116
ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.size_t(size), C.git_otype(otype))
117117
if ret < 0 {
118-
return nil, LastError()
118+
return nil, MakeGitError(ret)
119119
}
120120

121121
runtime.SetFinalizer(stream, (*OdbWriteStream).Free)
@@ -164,7 +164,7 @@ func (stream *OdbReadStream) Read(data []byte) (int, error) {
164164
size := C.size_t(header.Cap)
165165
ret := C.git_odb_stream_read(stream.ptr, ptr, size)
166166
if ret < 0 {
167-
return 0, LastError()
167+
return 0, MakeGitError(ret)
168168
}
169169

170170
header.Len = int(ret)
@@ -196,7 +196,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
196196

197197
ret := C.git_odb_stream_write(stream.ptr, ptr, size)
198198
if ret < 0 {
199-
return 0, LastError()
199+
return 0, MakeGitError(ret)
200200
}
201201

202202
return len(data), nil
@@ -207,7 +207,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
207207
func (stream *OdbWriteStream) Close() error {
208208
ret := C.git_odb_stream_finalize_write(stream.Id.toC(), stream.ptr)
209209
if ret < 0 {
210-
return LastError()
210+
return MakeGitError(ret)
211211
}
212212

213213
return nil

reference.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (v *ReferenceIterator) Next() (*Reference, error) {
247247
return nil, ErrIterOver
248248
}
249249
if ret < 0 {
250-
return nil, LastError()
250+
return nil, MakeGitError(ret)
251251
}
252252

253253
return newReferenceFromC(ptr), nil

submodule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ func (sub *Submodule) SetFetchRecurseSubmodules(recurse SubmoduleRecurse) error
247247

248248
ret := C.git_submodule_set_fetch_recurse_submodules(sub.ptr, C.git_submodule_recurse_t(recurse))
249249
if ret < 0 {
250-
return MakeGitError(ret)
250+
return MakeGitError(C.int(ret))
251251
}
252252
return nil
253253
}

tree.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (t Tree) EntryByPath(path string) (*TreeEntry, error) {
6767

6868
ret := C.git_tree_entry_bypath(&entry, t.ptr, cpath)
6969
if ret < 0 {
70-
return nil, LastError()
70+
return nil, MakeGitError(ret)
7171
}
7272

7373
return newTreeEntry(entry), nil

0 commit comments

Comments
 (0)