marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oci: Break out get_digest_subpath helper function

tingping/wmclass
Alexander Larsson 2017-03-28 10:40:14 +02:00
parent cac65fb6a1
commit d39491b5fb
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
common/flatpak-oci-registry.c
View File

@ -618,6 +618,21 @@ splice_update_checksum (GOutputStream *out,
return TRUE;
}
static char *
get_digest_subpath (const char *digest,
GError **error)
{
g_autofree char *subpath = NULL;
if (!g_str_has_prefix (digest, "sha256:"))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Unsupported digest type %s", digest);
return NULL;
}
return g_strdup_printf ("blobs/sha256/%s", digest + strlen ("sha256:"));
}
static char *
checksum_fd (int fd, GCancellable *cancellable, GError **error)
@ -646,14 +661,9 @@ flatpak_oci_registry_download_blob (FlatpakOciRegistry *self,
g_assert (self->valid);
if (!g_str_has_prefix (digest, "sha256:"))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Unsupported digest type %s", digest);
return -1;
}
subpath = g_strdup_printf ("blobs/sha256/%s", digest + strlen ("sha256:"));
subpath = get_digest_subpath (digest, error);
if (subpath == NULL)
return -1;
if (self->dfd != -1)
{
@ -729,14 +739,9 @@ flatpak_oci_registry_load_blob (FlatpakOciRegistry *self,
g_assert (self->valid);
if (!g_str_has_prefix (digest, "sha256:"))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"Unsupported digest type %s", digest);
return NULL;
}
subpath = g_strdup_printf ("blobs/sha256/%s", digest + strlen ("sha256:"));
subpath = get_digest_subpath (digest, error);
if (subpath == NULL)
return NULL;
bytes = flatpak_oci_registry_load_file (self, subpath, NULL, NULL, cancellable, error);