[ostree] libotutil: Remove ot_variant_new_from_bytes()
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] libotutil: Remove ot_variant_new_from_bytes()
- Date: Tue, 3 Mar 2015 00:20:07 +0000 (UTC)
commit b05d6700318d1cfeb4608cfea4c562321481c4ea
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Mar 2 15:11:16 2015 -0500
libotutil: Remove ot_variant_new_from_bytes()
Not needed anymore - use g_variant_new_from_bytes().
src/libostree/ostree-repo-pull.c | 10 +++++-----
.../ostree-repo-static-delta-processing.c | 4 ++--
src/libotutil/ot-variant-utils.c | 8 --------
src/libotutil/ot-variant-utils.h | 5 -----
4 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 5d35967..2a5e26a 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -1316,9 +1316,9 @@ fetch_metadata_to_verify_delta_superblock (OtPullData *pull_data,
cancellable, error))
goto out;
- metadata = ot_variant_new_from_bytes (G_VARIANT_TYPE ("a{sv}"),
- detached_meta_data,
- FALSE);
+ metadata = g_variant_new_from_bytes (G_VARIANT_TYPE ("a{sv}"),
+ detached_meta_data,
+ FALSE);
if (!_ostree_repo_gpg_verify_file_with_metadata (pull_data->repo, temp_input_path,
metadata, NULL, NULL,
@@ -1366,8 +1366,8 @@ request_static_delta_superblock_sync (OtPullData *pull_data,
goto out;
}
- ret_delta_superblock = ot_variant_new_from_bytes ((GVariantType*)OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT,
- delta_superblock_data, FALSE);
+ ret_delta_superblock = g_variant_new_from_bytes ((GVariantType*)OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT,
+ delta_superblock_data, FALSE);
}
ret = TRUE;
diff --git a/src/libostree/ostree-repo-static-delta-processing.c
b/src/libostree/ostree-repo-static-delta-processing.c
index 47adce3..5cfdba9 100644
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -350,8 +350,8 @@ _ostree_static_delta_part_execute (OstreeRepo *repo,
goto out;
}
- payload = ot_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0),
- payload_data, FALSE);
+ payload = g_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0),
+ payload_data, FALSE);
if (!_ostree_static_delta_part_execute_raw (repo, header, payload,
cancellable, error))
goto out;
diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index fab893e..5a8ca99 100644
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -275,14 +275,6 @@ ot_util_variant_builder_from_variant (GVariant *variant,
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:
* @array: A GVariant array whose first element must be a string
diff --git a/src/libotutil/ot-variant-utils.h b/src/libotutil/ot-variant-utils.h
index 56fb60e..34b6eb5 100644
--- a/src/libotutil/ot-variant-utils.h
+++ b/src/libotutil/ot-variant-utils.h
@@ -67,11 +67,6 @@ GInputStream *ot_variant_read (GVariant *variant);
GVariantBuilder *ot_util_variant_builder_from_variant (GVariant *variant,
const GVariantType *type);
-GVariant *
-ot_variant_new_from_bytes (const GVariantType *type,
- GBytes *bytes,
- gboolean trusted);
-
gboolean
ot_variant_bsearch_str (GVariant *array,
const char *str,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]