shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity

core: Add helper functions to convert (checksum, objtype) pair to/from string

Browse Source
This commit is contained in:
Colin Walters 2012-03-14 09:37:00 -04:00
parent 277843f3a2
commit 70afd6011f
4 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libostree/ostree-core.c
View File

@ -564,6 +564,26 @@ ostree_object_type_from_string (const char *str)
return 0;
}
char *
ostree_object_to_string (const char *checksum,
OstreeObjectType objtype)
{
return g_strconcat (checksum, ".", ostree_object_type_to_string (objtype), NULL);
}
void
ostree_object_from_string (const char *str,
gchar **out_checksum,
OstreeObjectType *out_objtype)
{
const char *dot;
dot = strrchr (str, '.');
g_assert (dot != NULL);
*out_checksum = g_strndup (str, dot - str);
*out_objtype = ostree_object_type_from_string (dot + 1);
}
char *
ostree_get_relative_object_path (const char *checksum,
OstreeObjectType type)

7
src/libostree/ostree-core.h
View File

@ -108,6 +108,13 @@ const char * ostree_object_type_to_string (OstreeObjectType objtype);
OstreeObjectType ostree_object_type_from_string (const char *str);
char * ostree_object_to_string (const char *checksum,
OstreeObjectType objtype);
void ostree_object_from_string (const char *str,
gchar **out_checksum,
OstreeObjectType *out_objtype);
char *ostree_get_relative_object_path (const char *checksum,
OstreeObjectType type);

20
src/libostree/ostree-repo.c
View File

@ -752,13 +752,6 @@ ostree_repo_get_file_object_path (OstreeRepo *self,
return ostree_repo_get_object_path (self, checksum, get_objtype_for_repo_file (self));
}
static char *
create_checksum_and_objtype (const char *checksum,
OstreeObjectType objtype)
{
return g_strconcat (checksum, ".", ostree_object_type_to_string (objtype), NULL);
}
static GFile *
get_pending_object_path (OstreeRepo *self,
const char *checksum,
@ -847,7 +840,7 @@ insert_into_transaction (OstreeRepo *self,
OstreeRepoPrivate *priv = GET_PRIVATE (self);
char *key;
key = create_checksum_and_objtype (checksum, objtype);
key = ostree_object_to_string (checksum, objtype);
/* Takes ownership */
g_hash_table_replace (priv->pending_transaction, key, NULL);
}
@ -1165,22 +1158,15 @@ ostree_repo_commit_transaction (OstreeRepo *self,
GHashTableIter iter;
gpointer key, value;
char *checksum = NULL;
OstreeObjectType objtype;
g_return_val_if_fail (priv->in_transaction == TRUE, FALSE);
g_hash_table_iter_init (&iter, priv->pending_transaction);
while (g_hash_table_iter_next (&iter, &key, &value))
{
const char *checksum_and_type = key;
const char *type_str;
OstreeObjectType objtype;
type_str = strrchr (checksum_and_type, '.');
g_assert (type_str);
g_free (checksum);
checksum = g_strndup (checksum_and_type, type_str - checksum_and_type);
objtype = ostree_object_type_from_string (type_str + 1);
ostree_object_from_string ((char*)key, &checksum, &objtype);
g_clear_object (&f);
f = get_pending_object_path (self, checksum, objtype);

23
src/ostree/ot-builtin-prune.c
View File

@ -69,13 +69,6 @@ typedef struct {
guint n_unreachable;
} OtPruneData;
static char *
create_checksum_and_objtype (const char *checksum,
OstreeObjectType objtype)
{
return g_strconcat (checksum, ".", ostree_object_type_to_string (objtype), NULL);
}
static gboolean
compute_reachable_objects_from_dir_contents (OstreeRepo *repo,
const char *sha256,
@ -93,7 +86,7 @@ compute_reachable_objects_from_dir_contents (OstreeRepo *repo,
if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_DIR_TREE, sha256, &tree, error))
goto out;
key = create_checksum_and_objtype (sha256, OSTREE_OBJECT_TYPE_DIR_TREE);
key = ostree_object_to_string (sha256, OSTREE_OBJECT_TYPE_DIR_TREE);
g_hash_table_replace (inout_reachable, key, key);
/* PARSE OSTREE_SERIALIZED_TREE_VARIANT */
@ -107,14 +100,14 @@ compute_reachable_objects_from_dir_contents (OstreeRepo *repo,
g_variant_get_child (files_variant, i, "(&s&s)", &filename, &checksum);
if (ostree_repo_get_mode (repo) == OSTREE_REPO_MODE_BARE)
{
key = create_checksum_and_objtype (checksum, OSTREE_OBJECT_TYPE_RAW_FILE);
key = ostree_object_to_string (checksum, OSTREE_OBJECT_TYPE_RAW_FILE);
g_hash_table_replace (inout_reachable, key, key);
}
else
{
key = create_checksum_and_objtype (checksum, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_META);
key = ostree_object_to_string (checksum, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_META);
g_hash_table_replace (inout_reachable, key, key);
key = create_checksum_and_objtype (checksum, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_CONTENT);
key = ostree_object_to_string (checksum, OSTREE_OBJECT_TYPE_ARCHIVED_FILE_CONTENT);
g_hash_table_replace (inout_reachable, key, key);
}
}
@ -134,7 +127,7 @@ compute_reachable_objects_from_dir_contents (OstreeRepo *repo,
cancellable, error))
goto out;
key = create_checksum_and_objtype (meta_checksum, OSTREE_OBJECT_TYPE_DIR_META);
key = ostree_object_to_string (meta_checksum, OSTREE_OBJECT_TYPE_DIR_META);
g_hash_table_replace (inout_reachable, key, key);
}
@ -166,7 +159,7 @@ compute_reachable_objects_from_commit (OstreeRepo *repo,
if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, sha256, &commit, error))
goto out;
key = create_checksum_and_objtype (sha256, OSTREE_OBJECT_TYPE_COMMIT);
key = ostree_object_to_string (sha256, OSTREE_OBJECT_TYPE_COMMIT);
g_hash_table_replace (inout_reachable, key, key);
/* PARSE OSTREE_SERIALIZED_COMMIT_VARIANT */
@ -184,7 +177,7 @@ compute_reachable_objects_from_commit (OstreeRepo *repo,
goto out;
g_variant_get_child (commit, 7, "&s", &meta_checksum);
key = create_checksum_and_objtype (meta_checksum, OSTREE_OBJECT_TYPE_DIR_META);
key = ostree_object_to_string (meta_checksum, OSTREE_OBJECT_TYPE_DIR_META);
g_hash_table_replace (inout_reachable, key, key);
}
@ -205,7 +198,7 @@ object_iter_callback (OstreeRepo *repo,
OtPruneData *data = user_data;
char *key;
key = create_checksum_and_objtype (checksum, objtype);
key = ostree_object_to_string (checksum, objtype);
if (!g_hash_table_lookup_extended (data->reachable, key, NULL, NULL))
{