mirror of
https://github.com/ostreedev/ostree.git
synced 2024-10-26 17:25:36 +03:00
repo-file: s/content_checksum/contents_checksum/
This is what we call it everywhere else, so just be consistent. It also lines up with metadata_checksum better. https://bugzilla.gnome.org/show_bug.cgi?id=707727
This commit is contained in:
parent
75225166da
commit
8ac0f99ed6
@ -231,8 +231,8 @@ ostree_diff_dirs (GFile *a,
|
||||
OstreeRepoFile *a_repof = (OstreeRepoFile*) a;
|
||||
OstreeRepoFile *b_repof = (OstreeRepoFile*) b;
|
||||
|
||||
if (strcmp (ostree_repo_file_tree_get_content_checksum (a_repof),
|
||||
ostree_repo_file_tree_get_content_checksum (b_repof)) == 0)
|
||||
if (strcmp (ostree_repo_file_tree_get_contents_checksum (a_repof),
|
||||
ostree_repo_file_tree_get_contents_checksum (b_repof)) == 0)
|
||||
{
|
||||
ret = TRUE;
|
||||
goto out;
|
||||
|
@ -1551,7 +1551,7 @@ write_directory_to_mtree_internal (OstreeRepo *self,
|
||||
}
|
||||
|
||||
if (repo_dir && repo_dir_was_empty)
|
||||
ostree_mutable_tree_set_contents_checksum (mtree, ostree_repo_file_tree_get_content_checksum (repo_dir));
|
||||
ostree_mutable_tree_set_contents_checksum (mtree, ostree_repo_file_tree_get_contents_checksum (repo_dir));
|
||||
|
||||
ret = TRUE;
|
||||
out:
|
||||
|
@ -357,7 +357,7 @@ ostree_repo_file_tree_set_metadata (OstreeRepoFile *self,
|
||||
}
|
||||
|
||||
const char *
|
||||
ostree_repo_file_tree_get_content_checksum (OstreeRepoFile *self)
|
||||
ostree_repo_file_tree_get_contents_checksum (OstreeRepoFile *self)
|
||||
{
|
||||
return self->tree_contents_checksum;
|
||||
}
|
||||
|
@ -65,9 +65,7 @@ void ostree_repo_file_tree_set_metadata (OstreeRepoFile *self,
|
||||
const char *checksum,
|
||||
GVariant *metadata);
|
||||
|
||||
void ostree_repo_file_tree_set_content_checksum (OstreeRepoFile *self,
|
||||
const char *checksum);
|
||||
const char *ostree_repo_file_tree_get_content_checksum (OstreeRepoFile *self);
|
||||
const char *ostree_repo_file_tree_get_contents_checksum (OstreeRepoFile *self);
|
||||
|
||||
gboolean ostree_repo_file_is_tree (OstreeRepoFile *self);
|
||||
|
||||
|
@ -92,7 +92,7 @@ print_one_file_text (GFile *f,
|
||||
if (opt_checksum)
|
||||
{
|
||||
if (type == G_FILE_TYPE_DIRECTORY)
|
||||
g_string_append_printf (buf, "%s ", ostree_repo_file_tree_get_content_checksum ((OstreeRepoFile*)f));
|
||||
g_string_append_printf (buf, "%s ", ostree_repo_file_tree_get_contents_checksum ((OstreeRepoFile*)f));
|
||||
g_string_append_printf (buf, "%s ", ostree_repo_file_get_checksum ((OstreeRepoFile*)f));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user