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

libotutil: Remove ot_variant_new_from_bytes() 

Not needed anymore - use g_variant_new_from_bytes().
This commit is contained in:
Matthew Barnes 2015-03-02 15:11:16 -05:00
parent 85933c7cca
commit b05d670031
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1316,9 +1316,9 @@ fetch_metadata_to_verify_delta_superblock (OtPullData *pull_data,
cancellable, error)) cancellable, error))
goto out; goto out;
metadata = ot_variant_new_from_bytes (G_VARIANT_TYPE ("a{sv}"), metadata = g_variant_new_from_bytes (G_VARIANT_TYPE ("a{sv}"),
detached_meta_data, detached_meta_data,
FALSE); FALSE);
if (!_ostree_repo_gpg_verify_file_with_metadata (pull_data->repo, temp_input_path, if (!_ostree_repo_gpg_verify_file_with_metadata (pull_data->repo, temp_input_path,
metadata, NULL, NULL, metadata, NULL, NULL,
@ -1366,8 +1366,8 @@ request_static_delta_superblock_sync (OtPullData *pull_data,
goto out; goto out;
} }
ret_delta_superblock = ot_variant_new_from_bytes ((GVariantType*)OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT, ret_delta_superblock = g_variant_new_from_bytes ((GVariantType*)OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT,
delta_superblock_data, FALSE); delta_superblock_data, FALSE);
} }
ret = TRUE; ret = TRUE;

4
src/libostree/ostree-repo-static-delta-processing.c
View File

@ -350,8 +350,8 @@ _ostree_static_delta_part_execute (OstreeRepo *repo,
goto out; goto out;
} }
payload = ot_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0), payload = g_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0),
payload_data, FALSE); payload_data, FALSE);
if (!_ostree_static_delta_part_execute_raw (repo, header, payload, if (!_ostree_static_delta_part_execute_raw (repo, header, payload,
cancellable, error)) cancellable, error))
goto out; goto out;

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

@ -275,14 +275,6 @@ ot_util_variant_builder_from_variant (GVariant *variant,
return builder; return builder;
} }
GVariant *
ot_variant_new_from_bytes (const GVariantType *type,
GBytes *bytes,
gboolean trusted)
{
return g_variant_new_from_bytes (type, bytes, trusted);
}
/** /**
* ot_variant_bsearch_str: * ot_variant_bsearch_str:
* @array: A GVariant array whose first element must be a string * @array: A GVariant array whose first element must be a string

5
src/libotutil/ot-variant-utils.h
View File

@ -67,11 +67,6 @@ GInputStream *ot_variant_read (GVariant *variant);
GVariantBuilder *ot_util_variant_builder_from_variant (GVariant *variant, GVariantBuilder *ot_util_variant_builder_from_variant (GVariant *variant,
const GVariantType *type); const GVariantType *type);
GVariant *
ot_variant_new_from_bytes (const GVariantType *type,
GBytes *bytes,
gboolean trusted);
gboolean gboolean
ot_variant_bsearch_str (GVariant *array, ot_variant_bsearch_str (GVariant *array,
const char *str, const char *str,