packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Add some GError guards

This commit is contained in:
Colin Walters 2011-10-14 23:13:23 -04:00
parent 72c7385295
commit ce6d9ca569
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libhacktree/hacktree-repo.c
View File

@ -228,6 +228,8 @@ hacktree_repo_check (HacktreeRepo *self, GError **error)
{ {
HacktreeRepoPrivate *priv = GET_PRIVATE (self); HacktreeRepoPrivate *priv = GET_PRIVATE (self);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (priv->inited) if (priv->inited)
return TRUE; return TRUE;
@ -600,6 +602,7 @@ hacktree_repo_link_file (HacktreeRepo *self,
HacktreeRepoPrivate *priv = GET_PRIVATE (self); HacktreeRepoPrivate *priv = GET_PRIVATE (self);
GChecksum *checksum = NULL; GChecksum *checksum = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE); g_return_val_if_fail (priv->inited, FALSE);
if (!link_one_file (self, path, HACKTREE_OBJECT_TYPE_FILE, if (!link_one_file (self, path, HACKTREE_OBJECT_TYPE_FILE,
@ -765,7 +768,7 @@ load_commit_and_trees (HacktreeRepo *self,
commit_sha256, &ret_commit, error)) commit_sha256, &ret_commit, error))
goto out; goto out;
g_variant_get_child (ret_commit, 5, "&s", &tree_checksum); g_variant_get_child (ret_commit, 6, "&s", &tree_checksum);
if (!parse_tree (self, tree_checksum, &ret_tree_data, error)) if (!parse_tree (self, tree_checksum, &ret_tree_data, error))
goto out; goto out;
@ -1039,6 +1042,7 @@ add_one_file_to_tree_and_import (HacktreeRepo *self,
gboolean ret = FALSE; gboolean ret = FALSE;
GChecksum *checksum = NULL; GChecksum *checksum = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_assert (tree != NULL); g_assert (tree != NULL);
if (!link_one_file (self, abspath, HACKTREE_OBJECT_TYPE_FILE, if (!link_one_file (self, abspath, HACKTREE_OBJECT_TYPE_FILE,
@ -1196,6 +1200,7 @@ hacktree_repo_commit (HacktreeRepo *self,
GChecksum *ret_commit_checksum = NULL; GChecksum *ret_commit_checksum = NULL;
GDateTime *now = NULL; GDateTime *now = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE); g_return_val_if_fail (priv->inited, FALSE);
if (priv->current_head) if (priv->current_head)
@ -1335,6 +1340,7 @@ hacktree_repo_iter_objects (HacktreeRepo *self,
GFileInfo *file_info = NULL; GFileInfo *file_info = NULL;
GError *temp_error = NULL; GError *temp_error = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE); g_return_val_if_fail (priv->inited, FALSE);
objectdir = g_file_new_for_path (priv->objects_path); objectdir = g_file_new_for_path (priv->objects_path);
@ -1392,6 +1398,8 @@ hacktree_repo_load_variant (HacktreeRepo *repo,
HacktreeSerializedVariantType ret_type; HacktreeSerializedVariantType ret_type;
GVariant *ret_variant = NULL; GVariant *ret_variant = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!load_gvariant_object_unknown (repo, sha256, &ret_type, &ret_variant, error)) if (!load_gvariant_object_unknown (repo, sha256, &ret_type, &ret_variant, error))
goto out; goto out;