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

_ostree_static_delta_part_validate: Take a stream instead of a file as arg 

This is only called in one place, and we have already opened the file there,
no need to open it twice.
This commit is contained in:
Alexander Larsson 2015-09-10 20:16:52 +02:00 committed by Colin Walters
parent 27fcf68e7c
commit fd6c572c42
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-repo-static-delta-core.c
View File

@ -318,7 +318,7 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self,
if (!skip_validation) if (!skip_validation)
{ {
g_autofree char *expected_checksum = ostree_checksum_from_bytes (csum); g_autofree char *expected_checksum = ostree_checksum_from_bytes (csum);
if (!_ostree_static_delta_part_validate (self, part_path, i, if (!_ostree_static_delta_part_validate (self, in, i,
expected_checksum, expected_checksum,
cancellable, error)) cancellable, error))
goto out; goto out;

2
src/libostree/ostree-repo-static-delta-private.h
View File

@ -104,7 +104,7 @@ G_BEGIN_DECLS
#define OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT "(a{sv}tayay" OSTREE_COMMIT_GVARIANT_STRING "aya" OSTREE_STATIC_DELTA_META_ENTRY_FORMAT "a" OSTREE_STATIC_DELTA_FALLBACK_FORMAT ")" #define OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT "(a{sv}tayay" OSTREE_COMMIT_GVARIANT_STRING "aya" OSTREE_STATIC_DELTA_META_ENTRY_FORMAT "a" OSTREE_STATIC_DELTA_FALLBACK_FORMAT ")"
gboolean _ostree_static_delta_part_validate (OstreeRepo *repo, gboolean _ostree_static_delta_part_validate (OstreeRepo *repo,
GFile *part_path, GInputStream *in,
guint part_offset, guint part_offset,
const char *expected_checksum, const char *expected_checksum,
GCancellable *cancellable, GCancellable *cancellable,

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

@ -150,22 +150,17 @@ open_output_target (StaticDeltaExecutionState *state,
gboolean gboolean
_ostree_static_delta_part_validate (OstreeRepo *repo, _ostree_static_delta_part_validate (OstreeRepo *repo,
GFile *part_path, GInputStream *in,
guint part_offset, guint part_offset,
const char *expected_checksum, const char *expected_checksum,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
g_autoptr(GInputStream) tmp_in = NULL;
g_autofree guchar *actual_checksum_bytes = NULL; g_autofree guchar *actual_checksum_bytes = NULL;
g_autofree char *actual_checksum = NULL; g_autofree char *actual_checksum = NULL;
tmp_in = (GInputStream*)g_file_read (part_path, cancellable, error); if (!ot_gio_checksum_stream (in, &actual_checksum_bytes,
if (!tmp_in)
goto out;
if (!ot_gio_checksum_stream (tmp_in, &actual_checksum_bytes,
cancellable, error)) cancellable, error))
goto out; goto out;