diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c index fd1ad21d..3250fe29 100644 --- a/src/libostree/ostree-diff.c +++ b/src/libostree/ostree-diff.c @@ -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; diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index ce2c62b3..ca3a2dfc 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -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: diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c index 6ff7b123..aff60371 100644 --- a/src/libostree/ostree-repo-file.c +++ b/src/libostree/ostree-repo-file.c @@ -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; } diff --git a/src/libostree/ostree-repo-file.h b/src/libostree/ostree-repo-file.h index 8541641f..4243b80b 100644 --- a/src/libostree/ostree-repo-file.h +++ b/src/libostree/ostree-repo-file.h @@ -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); diff --git a/src/ostree/ot-builtin-ls.c b/src/ostree/ot-builtin-ls.c index 79a73336..c7f180f8 100644 --- a/src/ostree/ot-builtin-ls.c +++ b/src/ostree/ot-builtin-ls.c @@ -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)); }