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

Remove uses of deprecated git_buf_free

This commit is contained in:
Carlos Martín Nieto 2018-08-08 11:51:51 +02:00
parent 973938cbb5
commit 538a05d55c
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
branch.go
View File

@ -208,7 +208,7 @@ func (repo *Repository) RemoteName(canonicalBranchName string) (string, error) {
if ret < 0 { if ret < 0 {
return "", MakeGitError(ret) return "", MakeGitError(ret)
} }
defer C.git_buf_free(&nameBuf) defer C.git_buf_dispose(&nameBuf)
return C.GoString(nameBuf.ptr), nil return C.GoString(nameBuf.ptr), nil
} }
@ -256,7 +256,7 @@ func (repo *Repository) UpstreamName(canonicalBranchName string) (string, error)
if ret < 0 { if ret < 0 {
return "", MakeGitError(ret) return "", MakeGitError(ret)
} }
defer C.git_buf_free(&nameBuf) defer C.git_buf_dispose(&nameBuf)
return C.GoString(nameBuf.ptr), nil return C.GoString(nameBuf.ptr), nil
} }

4
commit.go
View File

@ -37,10 +37,10 @@ func (c *Commit) RawMessage() string {
func (c *Commit) ExtractSignature() (string, string, error) { func (c *Commit) ExtractSignature() (string, string, error) {
var c_signed C.git_buf var c_signed C.git_buf
defer C.git_buf_free(&c_signed) defer C.git_buf_dispose(&c_signed)
var c_signature C.git_buf var c_signature C.git_buf
defer C.git_buf_free(&c_signature) defer C.git_buf_dispose(&c_signature)
oid := c.Id() oid := c.Id()
repo := C.git_commit_owner(c.cast_ptr) repo := C.git_commit_owner(c.cast_ptr)

10
config.go
View File

@ -134,7 +134,7 @@ func (c *Config) LookupString(name string) (string, error) {
if ret < 0 { if ret < 0 {
return "", MakeGitError(ret) return "", MakeGitError(ret)
} }
defer C.git_buf_free(&valBuf) defer C.git_buf_dispose(&valBuf)
return C.GoString(valBuf.ptr), nil return C.GoString(valBuf.ptr), nil
} }
@ -390,7 +390,7 @@ func (iter *ConfigIterator) Free() {
func ConfigFindGlobal() (string, error) { func ConfigFindGlobal() (string, error) {
var buf C.git_buf var buf C.git_buf
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
@ -405,7 +405,7 @@ func ConfigFindGlobal() (string, error) {
func ConfigFindSystem() (string, error) { func ConfigFindSystem() (string, error) {
var buf C.git_buf var buf C.git_buf
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
@ -420,7 +420,7 @@ func ConfigFindSystem() (string, error) {
func ConfigFindXDG() (string, error) { func ConfigFindXDG() (string, error) {
var buf C.git_buf var buf C.git_buf
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
@ -438,7 +438,7 @@ func ConfigFindXDG() (string, error) {
// Look for the file in %PROGRAMDATA%\Git\config used by portable git. // Look for the file in %PROGRAMDATA%\Git\config used by portable git.
func ConfigFindProgramdata() (string, error) { func ConfigFindProgramdata() (string, error) {
var buf C.git_buf var buf C.git_buf
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()

2
describe.go
View File

@ -212,7 +212,7 @@ func (result *DescribeResult) Format(opts *DescribeFormatOptions) (string, error
if ecode < 0 { if ecode < 0 {
return "", MakeGitError(ecode) return "", MakeGitError(ecode)
} }
defer C.git_buf_free(&resultBuf) defer C.git_buf_dispose(&resultBuf)
return C.GoString(resultBuf.ptr), nil return C.GoString(resultBuf.ptr), nil
} }

2
diff.go
View File

@ -246,7 +246,7 @@ const (
func (stats *DiffStats) String(format DiffStatsFormat, func (stats *DiffStats) String(format DiffStatsFormat,
width uint) (string, error) { width uint) (string, error) {
buf := C.git_buf{} buf := C.git_buf{}
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()

2
git.go
View File

@ -309,7 +309,7 @@ func Discover(start string, across_fs bool, ceiling_dirs []string) (string, erro
defer C.free(unsafe.Pointer(cstart)) defer C.free(unsafe.Pointer(cstart))
var buf C.git_buf var buf C.git_buf
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()

2
note.go
View File

@ -132,7 +132,7 @@ func (c *NoteCollection) DefaultRef() (string, error) {
} }
ret := C.GoString(buf.ptr) ret := C.GoString(buf.ptr)
C.git_buf_free(&buf) C.git_buf_dispose(&buf)
return ret, nil return ret, nil
} }

2
object.go
View File

@ -67,7 +67,7 @@ func (o *Object) ShortId() (string, error) {
if ecode < 0 { if ecode < 0 {
return "", MakeGitError(ecode) return "", MakeGitError(ecode)
} }
defer C.git_buf_free(&resultBuf) defer C.git_buf_dispose(&resultBuf)
return C.GoString(resultBuf.ptr), nil return C.GoString(resultBuf.ptr), nil
} }

2
patch.go
View File

@ -51,7 +51,7 @@ func (patch *Patch) String() (string, error) {
if ecode < 0 { if ecode < 0 {
return "", MakeGitError(ecode) return "", MakeGitError(ecode)
} }
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
return C.GoString(buf.ptr), nil return C.GoString(buf.ptr), nil
} }

2
settings.go
View File

@ -31,7 +31,7 @@ import (
func SearchPath(level ConfigLevel) (string, error) { func SearchPath(level ConfigLevel) (string, error) {
var buf C.git_buf var buf C.git_buf
defer C.git_buf_free(&buf) defer C.git_buf_dispose(&buf)
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()