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

lib/repo-commit: Fix types of content size cache entries 

Use goffset rather than gsize for file sizes. More importantly, get the
unpacked_size from g_file_info_get_size() (goffset) rather than from the
splice return value, which has type gssize.

This will make a difference on 32-bit systems, where goffset is defined
as off64_t, but gsize is 32 bits.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #999
Approved by: cgwalters
This commit is contained in:
Philip Withnall 2017-07-10 19:48:52 +01:00 committed by Atomic Bot
parent 0aa20df20e
commit 7d57459e83
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libostree/ostree-repo-commit.c
View File

@ -299,13 +299,13 @@ commit_loose_regfile_object (OstreeRepo *self,
typedef struct typedef struct
{ {
gsize unpacked; goffset unpacked;
gsize archived; goffset archived;
} OstreeContentSizeCacheEntry; } OstreeContentSizeCacheEntry;
static OstreeContentSizeCacheEntry * static OstreeContentSizeCacheEntry *
content_size_cache_entry_new (gsize unpacked, content_size_cache_entry_new (goffset unpacked,
gsize archived) goffset archived)
{ {
OstreeContentSizeCacheEntry *entry = g_slice_new0 (OstreeContentSizeCacheEntry); OstreeContentSizeCacheEntry *entry = g_slice_new0 (OstreeContentSizeCacheEntry);
@ -325,8 +325,8 @@ content_size_cache_entry_free (gpointer entry)
static void static void
repo_store_size_entry (OstreeRepo *self, repo_store_size_entry (OstreeRepo *self,
const gchar *checksum, const gchar *checksum,
gsize unpacked, goffset unpacked,
gsize archived) goffset archived)
{ {
if (G_UNLIKELY (self->object_sizes == NULL)) if (G_UNLIKELY (self->object_sizes == NULL))
self->object_sizes = g_hash_table_new_full (g_str_hash, g_str_equal, self->object_sizes = g_hash_table_new_full (g_str_hash, g_str_equal,
@ -594,7 +594,7 @@ write_content_object (OstreeRepo *self,
*/ */
g_auto(OtCleanupUnlinkat) tmp_unlinker = { self->tmp_dir_fd, NULL }; g_auto(OtCleanupUnlinkat) tmp_unlinker = { self->tmp_dir_fd, NULL };
g_auto(GLnxTmpfile) tmpf = { 0, }; g_auto(GLnxTmpfile) tmpf = { 0, };
gssize unpacked_size = 0; goffset unpacked_size = 0;
gboolean indexable = FALSE; gboolean indexable = FALSE;
/* Is it a symlink physically? */ /* Is it a symlink physically? */
if (phys_object_is_symlink) if (phys_object_is_symlink)
@ -643,10 +643,11 @@ write_content_object (OstreeRepo *self,
/* Don't close the base; we'll do that later */ /* Don't close the base; we'll do that later */
g_filter_output_stream_set_close_base_stream ((GFilterOutputStream*)compressed_out_stream, FALSE); g_filter_output_stream_set_close_base_stream ((GFilterOutputStream*)compressed_out_stream, FALSE);
unpacked_size = g_output_stream_splice (compressed_out_stream, file_input, if (g_output_stream_splice (compressed_out_stream, file_input,
0, cancellable, error); 0, cancellable, error) < 0)
if (unpacked_size < 0)
return FALSE; return FALSE;
unpacked_size = g_file_info_get_size (file_info);
} }
if (!g_output_stream_flush (temp_out, cancellable, error)) if (!g_output_stream_flush (temp_out, cancellable, error))