42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
|
From efd2345b347d05fc0e6893194b53e718324731e7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Colin Walters <walters@verbum.org>
|
||
|
|
Date: Thu, 8 Jan 2015 16:16:21 -0500
|
||
|
|
Subject: [PATCH] 32 bit fixes
|
||
|
|
|
||
|
|
---
|
||
|
|
src/libostree/ostree-repo-pull.c | 2 +-
|
||
|
|
src/libostree/ostree-repo-static-delta-compilation.c | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
|
||
|
|
index a6160d3..4732811 100644
|
||
|
|
--- a/src/libostree/ostree-repo-pull.c
|
||
|
|
+++ b/src/libostree/ostree-repo-pull.c
|
||
|
|
@@ -1847,7 +1847,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
|
||
|
|
|
||
|
|
if (pull_data->summary)
|
||
|
|
{
|
||
|
|
- guint64 commit_size = 0;
|
||
|
|
+ gsize commit_size = 0;
|
||
|
|
guint64 *malloced_size;
|
||
|
|
|
||
|
|
if (!lookup_commit_checksum_from_summary (pull_data, branch, &contents, &commit_size, error))
|
||
|
|
diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
|
||
|
|
index 24fe8f4..3fb6970 100644
|
||
|
|
--- a/src/libostree/ostree-repo-static-delta-compilation.c
|
||
|
|
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
|
||
|
|
@@ -548,8 +548,8 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
|
||
|
|
|
||
|
|
g_printerr ("part %u n:%u compressed:%" G_GUINT64_FORMAT " uncompressed:%" G_GUINT64_FORMAT "\n",
|
||
|
|
i, part_builder->objects->len,
|
||
|
|
- g_variant_get_size (delta_part),
|
||
|
|
- part_builder->uncompressed_size);
|
||
|
|
+ (guint64)g_variant_get_size (delta_part),
|
||
|
|
+ (guint64)part_builder->uncompressed_size);
|
||
|
|
}
|
||
|
|
|
||
|
|
descriptor_relpath = _ostree_get_relative_static_delta_path (from, to);
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|