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

tree-wide: Use g_hash_table_add() where applicable 

Just noticed a few while reading some code, decided to do a quick
cleanup.  It's shorter and clearer.

Closes: #614
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-12-05 21:06:43 -05:00 committed by Atomic Bot
parent 247a8718bb
commit 37965644ff
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-bootconfig-parser.c
View File

@ -193,7 +193,7 @@ ostree_bootconfig_parser_write_at (OstreeBootconfigParser *self,
else else
{ {
write_key (self, buf, key, value); write_key (self, buf, key, value);
g_hash_table_insert (written_overrides, (gpointer)key, (gpointer)key); g_hash_table_add (written_overrides, (gpointer)key);
} }
} }

2
src/libostree/ostree-repo-checkout.c
View File

@ -554,7 +554,7 @@ checkout_one_file_at (OstreeRepo *repo,
g_ascii_xdigit_value (checksum[1])); g_ascii_xdigit_value (checksum[1]));
if (repo->updated_uncompressed_dirs == NULL) if (repo->updated_uncompressed_dirs == NULL)
repo->updated_uncompressed_dirs = g_hash_table_new (NULL, NULL); repo->updated_uncompressed_dirs = g_hash_table_new (NULL, NULL);
g_hash_table_insert (repo->updated_uncompressed_dirs, key, key); g_hash_table_add (repo->updated_uncompressed_dirs, key);
} }
g_mutex_unlock (&repo->cache_lock); g_mutex_unlock (&repo->cache_lock);

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

@ -522,7 +522,7 @@ scan_dirtree_object (OtPullData *pull_data,
} }
else if (!file_is_stored && !g_hash_table_lookup (pull_data->requested_content, file_checksum)) else if (!file_is_stored && !g_hash_table_lookup (pull_data->requested_content, file_checksum))
{ {
g_hash_table_insert (pull_data->requested_content, file_checksum, file_checksum); g_hash_table_add (pull_data->requested_content, file_checksum);
enqueue_one_object_request (pull_data, file_checksum, OSTREE_OBJECT_TYPE_FILE, path, FALSE, FALSE); enqueue_one_object_request (pull_data, file_checksum, OSTREE_OBJECT_TYPE_FILE, path, FALSE, FALSE);
file_checksum = NULL; /* Transfer ownership */ file_checksum = NULL; /* Transfer ownership */
} }
@ -1292,7 +1292,7 @@ scan_one_metadata_object_c (OtPullData *pull_data,
char *duped_checksum = g_strdup (tmp_checksum); char *duped_checksum = g_strdup (tmp_checksum);
gboolean do_fetch_detached; gboolean do_fetch_detached;
g_hash_table_insert (pull_data->requested_metadata, duped_checksum, duped_checksum); g_hash_table_add (pull_data->requested_metadata, duped_checksum);
do_fetch_detached = (objtype == OSTREE_OBJECT_TYPE_COMMIT); do_fetch_detached = (objtype == OSTREE_OBJECT_TYPE_COMMIT);
enqueue_one_object_request (pull_data, tmp_checksum, objtype, path, do_fetch_detached, FALSE); enqueue_one_object_request (pull_data, tmp_checksum, objtype, path, do_fetch_detached, FALSE);
@ -1306,7 +1306,7 @@ scan_one_metadata_object_c (OtPullData *pull_data,
pull_data->cancellable, error)) pull_data->cancellable, error))
goto out; goto out;
g_hash_table_insert (pull_data->scanned_metadata, g_variant_ref (object), object); g_hash_table_add (pull_data->scanned_metadata, g_variant_ref (object));
pull_data->n_scanned_metadata++; pull_data->n_scanned_metadata++;
} }
else if (is_stored && objtype == OSTREE_OBJECT_TYPE_DIR_TREE) else if (is_stored && objtype == OSTREE_OBJECT_TYPE_DIR_TREE)
@ -1315,7 +1315,7 @@ scan_one_metadata_object_c (OtPullData *pull_data,
pull_data->cancellable, error)) pull_data->cancellable, error))
goto out; goto out;
g_hash_table_insert (pull_data->scanned_metadata, g_variant_ref (object), object); g_hash_table_add (pull_data->scanned_metadata, g_variant_ref (object));
pull_data->n_scanned_metadata++; pull_data->n_scanned_metadata++;
} }
@ -1536,7 +1536,7 @@ process_one_static_delta_fallback (OtPullData *pull_data,
if (!g_hash_table_lookup (pull_data->requested_metadata, checksum)) if (!g_hash_table_lookup (pull_data->requested_metadata, checksum))
{ {
gboolean do_fetch_detached; gboolean do_fetch_detached;
g_hash_table_insert (pull_data->requested_metadata, checksum, checksum); g_hash_table_add (pull_data->requested_metadata, checksum);
do_fetch_detached = (objtype == OSTREE_OBJECT_TYPE_COMMIT); do_fetch_detached = (objtype == OSTREE_OBJECT_TYPE_COMMIT);
enqueue_one_object_request (pull_data, checksum, objtype, NULL, do_fetch_detached, FALSE); enqueue_one_object_request (pull_data, checksum, objtype, NULL, do_fetch_detached, FALSE);
@ -1547,7 +1547,7 @@ process_one_static_delta_fallback (OtPullData *pull_data,
{ {
if (!g_hash_table_lookup (pull_data->requested_content, checksum)) if (!g_hash_table_lookup (pull_data->requested_content, checksum))
{ {
g_hash_table_insert (pull_data->requested_content, checksum, checksum); g_hash_table_add (pull_data->requested_content, checksum);
enqueue_one_object_request (pull_data, checksum, OSTREE_OBJECT_TYPE_FILE, NULL, FALSE, FALSE); enqueue_one_object_request (pull_data, checksum, OSTREE_OBJECT_TYPE_FILE, NULL, FALSE, FALSE);
checksum = NULL; /* Transfer ownership */ checksum = NULL; /* Transfer ownership */
} }
@ -2836,7 +2836,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (ostree_validate_checksum_string (branch, NULL)) if (ostree_validate_checksum_string (branch, NULL))
{ {
char *key = g_strdup (branch); char *key = g_strdup (branch);
g_hash_table_insert (commits_to_fetch, key, key); g_hash_table_add (commits_to_fetch, key);
} }
else else
{ {

2
src/ostree/ot-builtin-fsck.c
View File

@ -311,7 +311,7 @@ ostree_builtin_fsck (int argc, char **argv, GCancellable *cancellable, GError **
if (commitstate & OSTREE_REPO_COMMIT_STATE_PARTIAL) if (commitstate & OSTREE_REPO_COMMIT_STATE_PARTIAL)
n_partial++; n_partial++;
else else
g_hash_table_insert (commits, g_variant_ref (serialized_key), serialized_key); g_hash_table_add (commits, g_variant_ref (serialized_key));
} }
} }