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

lib/repo-pull: Rename a variable for clarity 

In libostree, the phrase "commit metadata" has two meanings-- one is the
first dictionary in a commit GVariant that stores metadata such as ref
bindings, and the other is the commit metadata in the summary file,
which stores the commit size, checksum, and timestamp. In
find_remotes_process_refs(), the entire commit GVariant was being
referred to as commit metadata, so this commit changes the variable
name and a comment to make things more consistent.

Closes: #1528
Approved by: cgwalters
This commit is contained in:
Matthew Leeds 2018-03-30 18:11:45 -07:00 committed by Atomic Bot
parent 005d25cc75
commit 5d84f5e102
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libostree/ostree-repo-pull.c
View File

@ -4764,7 +4764,7 @@ find_remotes_process_refs (OstreeRepo *self,
for (j = 0, n = g_variant_n_children (summary_refs); j < n; j++) for (j = 0, n = g_variant_n_children (summary_refs); j < n; j++)
{ {
const guchar *csum_bytes; const guchar *csum_bytes;
g_autoptr(GVariant) ref_v = NULL, csum_v = NULL, commit_metadata_v = NULL, stored_commit_metadata_v = NULL; g_autoptr(GVariant) ref_v = NULL, csum_v = NULL, commit_metadata_v = NULL, stored_commit_v = NULL;
guint64 commit_size, commit_timestamp; guint64 commit_size, commit_timestamp;
gchar tmp_checksum[OSTREE_SHA256_STRING_LEN + 1]; gchar tmp_checksum[OSTREE_SHA256_STRING_LEN + 1];
gsize ref_index; gsize ref_index;
@ -4801,9 +4801,9 @@ find_remotes_process_refs (OstreeRepo *self,
if (!collection_refv_contains (refs, summary_collection_id, ref_name, &ref_index)) if (!collection_refv_contains (refs, summary_collection_id, ref_name, &ref_index))
continue; continue;
/* Load the commit metadata from disk if possible, for verification. */ /* Load the commit from disk if possible, for verification. */
if (!ostree_repo_load_commit (self, tmp_checksum, &stored_commit_metadata_v, NULL, NULL)) if (!ostree_repo_load_commit (self, tmp_checksum, &stored_commit_v, NULL, NULL))
stored_commit_metadata_v = NULL; stored_commit_v = NULL;
/* Check the additional metadata. */ /* Check the additional metadata. */
if (!g_variant_lookup (commit_metadata_v, OSTREE_COMMIT_TIMESTAMP, "t", &commit_timestamp)) if (!g_variant_lookup (commit_metadata_v, OSTREE_COMMIT_TIMESTAMP, "t", &commit_timestamp))
@ -4826,7 +4826,7 @@ find_remotes_process_refs (OstreeRepo *self,
if (commit_metadata == NULL) if (commit_metadata == NULL)
{ {
commit_metadata = commit_metadata_new (tmp_checksum, commit_size, commit_metadata = commit_metadata_new (tmp_checksum, commit_size,
(stored_commit_metadata_v != NULL) ? ostree_commit_get_timestamp (stored_commit_metadata_v) : 0, (stored_commit_v != NULL) ? ostree_commit_get_timestamp (stored_commit_v) : 0,
NULL); NULL);
g_hash_table_insert (commit_metadatas, commit_metadata->checksum, g_hash_table_insert (commit_metadatas, commit_metadata->checksum,
commit_metadata /* transfer */); commit_metadata /* transfer */);