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

[staticanalysis]: Fix some dead code 

One was an unused variable, the other is actually dead because we
can't have mfile != NULL.

https://bugzilla.gnome.org/show_bug.cgi?id=732020
This commit is contained in:
Colin Walters 2014-06-21 17:34:20 -04:00
parent 54079982d8
commit 5936740b95
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -711,7 +711,6 @@ scan_commit_object (OtPullData *pull_data,
gs_unref_variant GVariant *commit = NULL; gs_unref_variant GVariant *commit = NULL;
gs_unref_variant GVariant *tree_contents_csum = NULL; gs_unref_variant GVariant *tree_contents_csum = NULL;
gs_unref_variant GVariant *tree_meta_csum = NULL; gs_unref_variant GVariant *tree_meta_csum = NULL;
GVariantIter *iter = NULL;
if (recursion_depth > OSTREE_MAX_RECURSION) if (recursion_depth > OSTREE_MAX_RECURSION)
{ {
@ -755,8 +754,6 @@ scan_commit_object (OtPullData *pull_data,
ret = TRUE; ret = TRUE;
out: out:
if (iter)
g_variant_iter_free (iter);
return ret; return ret;
} }
@ -1036,7 +1033,6 @@ ostree_repo_pull (OstreeRepo *self,
gs_unref_hashtable GHashTable *requested_refs_to_fetch = NULL; gs_unref_hashtable GHashTable *requested_refs_to_fetch = NULL;
gs_unref_hashtable GHashTable *commits_to_fetch = NULL; gs_unref_hashtable GHashTable *commits_to_fetch = NULL;
gs_free char *remote_mode_str = NULL; gs_free char *remote_mode_str = NULL;
GSource *queue_src = NULL;
OtPullData pull_data_real = { 0, }; OtPullData pull_data_real = { 0, };
OtPullData *pull_data = &pull_data_real; OtPullData *pull_data = &pull_data_real;
GKeyFile *config = NULL; GKeyFile *config = NULL;
@ -1310,8 +1306,6 @@ ostree_repo_pull (OstreeRepo *self,
g_free (pull_data->remote_name); g_free (pull_data->remote_name);
if (pull_data->base_uri) if (pull_data->base_uri)
soup_uri_free (pull_data->base_uri); soup_uri_free (pull_data->base_uri);
if (queue_src)
g_source_destroy (queue_src);
g_clear_pointer (&pull_data->static_delta_metas, (GDestroyNotify) g_ptr_array_unref); g_clear_pointer (&pull_data->static_delta_metas, (GDestroyNotify) g_ptr_array_unref);
g_clear_pointer (&pull_data->scanned_metadata, (GDestroyNotify) g_hash_table_unref); g_clear_pointer (&pull_data->scanned_metadata, (GDestroyNotify) g_hash_table_unref);
g_clear_pointer (&pull_data->requested_content, (GDestroyNotify) g_hash_table_unref); g_clear_pointer (&pull_data->requested_content, (GDestroyNotify) g_hash_table_unref);

3
src/libotutil/ot-variant-utils.c
View File

@ -140,14 +140,11 @@ ot_util_variant_map (GFile *src,
trusted, trusted,
(GDestroyNotify) g_mapped_file_unref, (GDestroyNotify) g_mapped_file_unref,
mfile); mfile);
mfile = NULL;
g_variant_ref_sink (ret_variant); g_variant_ref_sink (ret_variant);
ret = TRUE; ret = TRUE;
ot_transfer_out_value(out_variant, &ret_variant); ot_transfer_out_value(out_variant, &ret_variant);
out: out:
if (mfile)
g_mapped_file_unref (mfile);
return ret; return ret;
} }