[ostree] repo-file: s/content_checksum/contents_checksum/
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] repo-file: s/content_checksum/contents_checksum/
- Date: Sun, 8 Sep 2013 16:53:50 +0000 (UTC)
commit 8ac0f99ed6ac873ee80f04c1b72de73bbd32dba1
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Sep 6 20:19:42 2013 -0400
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
src/libostree/ostree-diff.c | 4 ++--
src/libostree/ostree-repo-commit.c | 2 +-
src/libostree/ostree-repo-file.c | 2 +-
src/libostree/ostree-repo-file.h | 4 +---
src/ostree/ot-builtin-ls.c | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index fd1ad21..3250fe2 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 ce2c62b..ca3a2df 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 6ff7b12..aff6037 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 8541641..4243b80 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 79a7333..c7f180f 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));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]