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

lib/deltas: More porting to new code style 

Just noticed some of this while working on the previous tmpfile bits.

Closes: #973
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-28 13:55:19 -04:00 committed by Atomic Bot
parent ab9fef5279
commit 064d7bffef
1 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -409,14 +409,12 @@ _ostree_static_delta_part_open (GInputStream *part_in,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE;
const gboolean trusted = (flags & OSTREE_STATIC_DELTA_OPEN_FLAGS_VARIANT_TRUSTED) > 0; const gboolean trusted = (flags & OSTREE_STATIC_DELTA_OPEN_FLAGS_VARIANT_TRUSTED) > 0;
const gboolean skip_checksum = (flags & OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM) > 0; const gboolean skip_checksum = (flags & OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM) > 0;
gsize bytes_read; gsize bytes_read;
guint8 comptype; guint8 comptype;
g_autoptr(GChecksum) checksum = NULL; g_autoptr(GChecksum) checksum = NULL;
g_autoptr(GInputStream) checksum_in = NULL; g_autoptr(GInputStream) checksum_in = NULL;
g_autoptr(GVariant) ret_part = NULL;
GInputStream *source_in; GInputStream *source_in;
/* We either take a fd or a GBytes reference */ /* We either take a fd or a GBytes reference */
@ -438,13 +436,11 @@ _ostree_static_delta_part_open (GInputStream *part_in,
/* First byte is compression type */ /* First byte is compression type */
if (!g_input_stream_read_all (source_in, buf, sizeof(buf), &bytes_read, if (!g_input_stream_read_all (source_in, buf, sizeof(buf), &bytes_read,
cancellable, error)) cancellable, error))
{ return glnx_prefix_error (error, "Reading initial compression flag byte");
g_prefix_error (error, "Reading initial compression flag byte: ");
goto out;
}
comptype = buf[0]; comptype = buf[0];
} }
g_autoptr(GVariant) ret_part = NULL;
switch (comptype) switch (comptype)
{ {
case 0: case 0:
@ -455,7 +451,7 @@ _ostree_static_delta_part_open (GInputStream *part_in,
/* No compression, no checksums - a fast path */ /* No compression, no checksums - a fast path */
if (!ot_util_variant_map_fd (part_fd, 1, G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0), if (!ot_util_variant_map_fd (part_fd, 1, G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0),
trusted, &ret_part, error)) trusted, &ret_part, error))
goto out; return FALSE;
} }
else else
{ {
@ -477,16 +473,14 @@ _ostree_static_delta_part_open (GInputStream *part_in,
g_autoptr(GInputStream) convin = g_converter_input_stream_new (source_in, decomp); g_autoptr(GInputStream) convin = g_converter_input_stream_new (source_in, decomp);
g_autoptr(GBytes) buf = ot_map_anonymous_tmpfile_from_content (convin, cancellable, error); g_autoptr(GBytes) buf = ot_map_anonymous_tmpfile_from_content (convin, cancellable, error);
if (!buf) if (!buf)
goto out; return FALSE;
ret_part = g_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0), ret_part = g_variant_new_from_bytes (G_VARIANT_TYPE (OSTREE_STATIC_DELTA_PART_PAYLOAD_FORMAT_V0),
buf, FALSE); buf, FALSE);
} }
break; break;
default: default:
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, return glnx_throw (error, "Invalid compression type '%u'", comptype);
"Invalid compression type '%u'", comptype);
goto out;
} }
if (checksum) if (checksum)
@ -494,18 +488,12 @@ _ostree_static_delta_part_open (GInputStream *part_in,
const char *actual_checksum = g_checksum_get_string (checksum); const char *actual_checksum = g_checksum_get_string (checksum);
g_assert (expected_checksum != NULL); g_assert (expected_checksum != NULL);
if (strcmp (actual_checksum, expected_checksum) != 0) if (strcmp (actual_checksum, expected_checksum) != 0)
{ return glnx_throw (error, "Checksum mismatch in static delta part; expected=%s actual=%s",
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, expected_checksum, actual_checksum);
"Checksum mismatch in static delta part; expected=%s actual=%s",
expected_checksum, actual_checksum);
goto out;
}
} }
ret = TRUE;
*out_part = g_steal_pointer (&ret_part); *out_part = g_steal_pointer (&ret_part);
out: return TRUE;
return ret;
} }
/* /*
@ -524,15 +512,12 @@ show_one_part (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; g_autoptr(GVariant) part = NULL;
g_autofree char *part_path = _ostree_get_relative_static_delta_part_path (from, to, i);
guint32 version; guint32 version;
guint64 size, usize; guint64 size, usize;
g_autoptr(GVariant) objects = NULL; g_autoptr(GVariant) objects = NULL;
g_autoptr(GInputStream) part_in = NULL;
g_autoptr(GVariant) part = NULL;
g_autofree char *part_path = _ostree_get_relative_static_delta_part_path (from, to, i);
gint part_fd = -1;
g_variant_get_child (meta_entries, i, "(u@aytt@ay)", &version, NULL, &size, &usize, &objects); g_variant_get_child (meta_entries, i, "(u@aytt@ay)", &version, NULL, &size, &usize, &objects);
size = maybe_swap_endian_u64 (swap_endian, size); size = maybe_swap_endian_u64 (swap_endian, size);
usize = maybe_swap_endian_u64 (swap_endian, usize); usize = maybe_swap_endian_u64 (swap_endian, usize);
@ -541,21 +526,17 @@ show_one_part (OstreeRepo *self,
g_print ("PartMeta%u: nobjects=%u size=%" G_GUINT64_FORMAT " usize=%" G_GUINT64_FORMAT "\n", g_print ("PartMeta%u: nobjects=%u size=%" G_GUINT64_FORMAT " usize=%" G_GUINT64_FORMAT "\n",
i, (guint)(g_variant_get_size (objects) / OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN), size, usize); i, (guint)(g_variant_get_size (objects) / OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN), size, usize);
part_fd = openat (self->repo_dir_fd, part_path, O_RDONLY | O_CLOEXEC); glnx_fd_close gint part_fd = openat (self->repo_dir_fd, part_path, O_RDONLY | O_CLOEXEC);
if (part_fd < 0) if (part_fd < 0)
{ return glnx_throw_errno_prefix (error, "openat(%s)", part_path);
glnx_set_error_from_errno (error); g_autoptr(GInputStream) part_in = g_unix_input_stream_new (part_fd, FALSE);
goto out;
}
part_in = g_unix_input_stream_new (part_fd, FALSE);
if (!_ostree_static_delta_part_open (part_in, NULL, if (!_ostree_static_delta_part_open (part_in, NULL,
OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM, OSTREE_STATIC_DELTA_OPEN_FLAGS_SKIP_CHECKSUM,
NULL, NULL,
&part, &part,
cancellable, error)) cancellable, error))
goto out; return FALSE;
{ g_autoptr(GVariant) modes = NULL; { g_autoptr(GVariant) modes = NULL;
g_autoptr(GVariant) xattrs = NULL; g_autoptr(GVariant) xattrs = NULL;
@ -580,7 +561,7 @@ show_one_part (OstreeRepo *self,
if (!_ostree_static_delta_part_execute (self, objects, if (!_ostree_static_delta_part_execute (self, objects,
part, TRUE, part, TRUE,
&stats, cancellable, error)) &stats, cancellable, error))
goto out; return FALSE;
{ const guint *n_ops = stats.n_ops_executed; { const guint *n_ops = stats.n_ops_executed;
g_print ("PartPayloadOps%u: openspliceclose=%u open=%u write=%u setread=%u " g_print ("PartPayloadOps%u: openspliceclose=%u open=%u write=%u setread=%u "
@ -589,9 +570,7 @@ show_one_part (OstreeRepo *self,
} }
} }
ret = TRUE; return TRUE;
out:
return ret;
} }
OstreeDeltaEndianness OstreeDeltaEndianness
@ -748,13 +727,12 @@ _ostree_repo_static_delta_query_exists (OstreeRepo *self,
{ {
g_autofree char *from = NULL; g_autofree char *from = NULL;
g_autofree char *to = NULL; g_autofree char *to = NULL;
g_autofree char *superblock_path = NULL;
struct stat stbuf; struct stat stbuf;
if (!_ostree_parse_delta_name (delta_id, &from, &to, error)) if (!_ostree_parse_delta_name (delta_id, &from, &to, error))
return FALSE; return FALSE;
superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to); g_autofree char *superblock_path = _ostree_get_relative_static_delta_superblock_path (from, to);
if (fstatat (self->repo_dir_fd, superblock_path, &stbuf, 0) < 0) if (fstatat (self->repo_dir_fd, superblock_path, &stbuf, 0) < 0)
{ {
@ -764,10 +742,7 @@ _ostree_repo_static_delta_query_exists (OstreeRepo *self,
return TRUE; return TRUE;
} }
else else
{ return glnx_throw_errno_prefix (error, "fstatat(%s)", superblock_path);
glnx_set_error_from_errno (error);
return FALSE;
}
} }
*out_exists = TRUE; *out_exists = TRUE;
return TRUE; return TRUE;