1 files changed, 60 insertions, 34 deletions

diff --git a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/builtin.go b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/builtin.go
index d3a8ae5fd..24822b2b7 100644
--- a/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/builtin.go
+++ b/vendor/github.com/ostreedev/ostree-go/pkg/otbuiltin/builtin.go
@@ -18,76 +18,102 @@ import (
 // #include "builtin.go.h"
 import "C"
 
+// Repo represents a local ostree repository
 type Repo struct {
-	//*glib.GObject
 	ptr unsafe.Pointer
 }
 
-// Converts an ostree repo struct to its C equivalent
+// isInitialized checks if the repo has been initialized
+func (r *Repo) isInitialized() bool {
+	if r == nil || r.ptr == nil {
+		return false
+	}
+	return true
+}
+
+// native converts an ostree repo struct to its C equivalent
 func (r *Repo) native() *C.OstreeRepo {
-	//return (*C.OstreeRepo)(r.Ptr())
+	if !r.isInitialized() {
+		return nil
+	}
 	return (*C.OstreeRepo)(r.ptr)
 }
 
-// Takes a C ostree repo and converts it to a Go struct
-func repoFromNative(p *C.OstreeRepo) *Repo {
-	if p == nil {
+// repoFromNative takes a C ostree repo and converts it to a Go struct
+func repoFromNative(or *C.OstreeRepo) *Repo {
+	if or == nil {
 		return nil
 	}
-	//o := (*glib.GObject)(unsafe.Pointer(p))
-	//r := &Repo{o}
-	r := &Repo{unsafe.Pointer(p)}
+	r := &Repo{unsafe.Pointer(or)}
 	return r
 }
 
-// Checks if the repo has been initialized
-func (r *Repo) isInitialized() bool {
-	if r.ptr != nil {
-		return true
+// OpenRepo attempts to open the repo at the given path
+func OpenRepo(path string) (*Repo, error) {
+	if path == "" {
+		return nil, errors.New("empty path")
 	}
-	return false
-}
 
-// Attempts to open the repo at the given path
-func OpenRepo(path string) (*Repo, error) {
-	var cerr *C.GError = nil
 	cpath := C.CString(path)
-	pathc := C.g_file_new_for_path(cpath)
-	defer C.g_object_unref(C.gpointer(pathc))
-	crepo := C.ostree_repo_new(pathc)
+	defer C.free(unsafe.Pointer(cpath))
+	repoPath := C.g_file_new_for_path(cpath)
+	defer C.g_object_unref(C.gpointer(repoPath))
+	crepo := C.ostree_repo_new(repoPath)
 	repo := repoFromNative(crepo)
+
+	var cerr *C.GError
 	r := glib.GoBool(glib.GBoolean(C.ostree_repo_open(crepo, nil, &cerr)))
 	if !r {
 		return nil, generateError(cerr)
 	}
+
 	return repo, nil
 }
 
-// Enable support for tombstone commits, which allow the repo to distinguish between
-// commits that were intentionally deleted and commits that were removed accidentally
-func enableTombstoneCommits(repo *Repo) error {
-	var tombstoneCommits bool
-	var config *C.GKeyFile = C.ostree_repo_get_config(repo.native())
-	var cerr *C.GError
+// enableTombstoneCommits enables support for tombstone commits.
+//
+// This allows to distinguish between intentional deletions and accidental removals
+// of commits.
+func (r *Repo) enableTombstoneCommits() error {
+	if !r.isInitialized() {
+		return errors.New("repo not initialized")
+	}
 
-	tombstoneCommits = glib.GoBool(glib.GBoolean(C.g_key_file_get_boolean(config, (*C.gchar)(C.CString("core")), (*C.gchar)(C.CString("tombstone-commits")), nil)))
+	config := C.ostree_repo_get_config(r.native())
+	groupC := C.CString("core")
+	defer C.free(unsafe.Pointer(groupC))
+	keyC := C.CString("tombstone-commits")
+	defer C.free(unsafe.Pointer(keyC))
+	valueC := C.g_key_file_get_boolean(config, (*C.gchar)(groupC), (*C.gchar)(keyC), nil)
+	tombstoneCommits := glib.GoBool(glib.GBoolean(valueC))
 
-	//tombstoneCommits is false only if it really is false or if it is set to FALSE in the config file
+	// tombstoneCommits is false only if it really is false or if it is set to FALSE in the config file
 	if !tombstoneCommits {
-		C.g_key_file_set_boolean(config, (*C.gchar)(C.CString("core")), (*C.gchar)(C.CString("tombstone-commits")), C.TRUE)
-		if !glib.GoBool(glib.GBoolean(C.ostree_repo_write_config(repo.native(), config, &cerr))) {
+		var cerr *C.GError
+		C.g_key_file_set_boolean(config, (*C.gchar)(groupC), (*C.gchar)(keyC), C.TRUE)
+		if !glib.GoBool(glib.GBoolean(C.ostree_repo_write_config(r.native(), config, &cerr))) {
 			return generateError(cerr)
 		}
 	}
 	return nil
 }
 
+// generateError wraps a GLib error into a Go one.
 func generateError(err *C.GError) error {
+	if err == nil {
+		return errors.New("nil GError")
+	}
+
 	goErr := glib.ConvertGError(glib.ToGError(unsafe.Pointer(err)))
 	_, file, line, ok := runtime.Caller(1)
 	if ok {
-		return errors.New(fmt.Sprintf("%s:%d - %s", file, line, goErr))
-	} else {
-		return goErr
+		return fmt.Errorf("%s:%d - %s", file, line, goErr)
 	}
+	return goErr
+}
+
+// isOk wraps a return value (gboolean/gint) into a bool.
+// 0 is false/error, everything else is true/ok.
+func isOk(v C.int) bool {
+	return glib.GoBool(glib.GBoolean(v))
 }