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

core: Remove old wrapper functions in import path 

Just code cleanup.
This commit is contained in:
Colin Walters 2011-11-08 19:23:04 -05:00
parent b11096cdd7
commit b837db20ef
2 changed files with 7 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libostree/ostree-repo.c
View File

@ -29,12 +29,6 @@
#include <gio/gunixoutputstream.h> #include <gio/gunixoutputstream.h>
#include <gio/gunixinputstream.h> #include <gio/gunixinputstream.h>
static gboolean
link_one_file (OstreeRepo *self, const char *path,
OstreeObjectType type,
gboolean ignore_exists, gboolean force,
GChecksum **out_checksum,
GError **error);
static char * static char *
get_object_path (OstreeRepo *self, get_object_path (OstreeRepo *self,
const char *checksum, const char *checksum,
@ -932,53 +926,6 @@ ostree_repo_store_object_trusted (OstreeRepo *self,
return link_object_trusted (self, path, checksum, objtype, ignore_exists, force, did_exist, error); return link_object_trusted (self, path, checksum, objtype, ignore_exists, force, did_exist, error);
} }
static gboolean
link_one_file (OstreeRepo *self, const char *path, OstreeObjectType type,
gboolean ignore_exists, gboolean force,
GChecksum **out_checksum,
GError **error)
{
gboolean ret = FALSE;
struct stat stbuf;
GChecksum *id = NULL;
gboolean did_exist;
if (!ostree_stat_and_checksum_file (-1, path, type, &id, &stbuf, error))
goto out;
if (!ostree_repo_store_object_trusted (self, path, g_checksum_get_string (id), type,
ignore_exists, force, &did_exist, error))
goto out;
*out_checksum = id;
id = NULL;
ret = TRUE;
out:
if (id != NULL)
g_checksum_free (id);
return ret;
}
gboolean
ostree_repo_link_file (OstreeRepo *self,
const char *path,
gboolean ignore_exists,
gboolean force,
GError **error)
{
OstreeRepoPrivate *priv = GET_PRIVATE (self);
GChecksum *checksum = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE);
if (!link_one_file (self, path, OSTREE_OBJECT_TYPE_FILE,
ignore_exists, force, &checksum, error))
return FALSE;
g_checksum_free (checksum);
return TRUE;
}
gboolean gboolean
ostree_repo_store_packfile (OstreeRepo *self, ostree_repo_store_packfile (OstreeRepo *self,
const char *expected_checksum, const char *expected_checksum,
@ -1509,12 +1456,17 @@ add_one_file_to_tree_and_import (OstreeRepo *self,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
GChecksum *checksum = NULL; GChecksum *checksum = NULL;
struct stat stbuf;
gboolean did_exist;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_assert (tree != NULL); g_assert (tree != NULL);
if (!link_one_file (self, abspath, OSTREE_OBJECT_TYPE_FILE, if (!ostree_stat_and_checksum_file (-1, abspath, OSTREE_OBJECT_TYPE_FILE, &checksum, &stbuf, error))
TRUE, FALSE, &checksum, error)) goto out;
if (!ostree_repo_store_object_trusted (self, abspath, g_checksum_get_string (checksum),
OSTREE_OBJECT_TYPE_FILE, TRUE, FALSE, &did_exist, error))
goto out; goto out;
g_hash_table_replace (tree->files, g_strdup (basename), g_hash_table_replace (tree->files, g_strdup (basename),

6
libostree/ostree-repo.h
View File

@ -65,12 +65,6 @@ gboolean ostree_repo_write_config (OstreeRepo *self,
GKeyFile *new_config, GKeyFile *new_config,
GError **error); GError **error);
gboolean ostree_repo_link_file (OstreeRepo *self,
const char *path,
gboolean ignore_exists,
gboolean force,
GError **error);
gboolean ostree_repo_store_packfile (OstreeRepo *self, gboolean ostree_repo_store_packfile (OstreeRepo *self,
const char *expected_checksum, const char *expected_checksum,
const char *path, const char *path,