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

flatpak_compose_ref: Remove unused error argument 

Closes: #81
Approved by: alexlarsson
tingping/wmclass
Alexander Larsson 2017-12-12 12:35:35 +01:00 committed by Atomic Bot
parent 61ae14a6b8
commit 39ad84c499
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/builder-flatpak-utils.c
View File

@ -399,8 +399,7 @@ char *
flatpak_compose_ref (gboolean app,
const char *name,
const char *branch,
const char *arch,
GError **error)
const char *arch)
{
if (app)
return flatpak_build_app_ref (name, branch, arch);

3
src/builder-flatpak-utils.h
View File

@ -130,8 +130,7 @@ char **flatpak_decompose_ref (const char *ref,
char * flatpak_compose_ref (gboolean app,
const char *name,
const char *branch,
const char *arch,
GError **error);
const char *arch);
char * flatpak_build_untyped_ref (const char *runtime,
const char *branch,

8
src/builder-manifest.c
View File

@ -2493,9 +2493,7 @@ builder_manifest_finish (BuilderManifest *self,
ref = flatpak_compose_ref (!self->build_runtime && !self->build_extension,
builder_manifest_get_id (self),
builder_manifest_get_branch (self),
builder_context_get_arch (context), error);
if (ref == NULL)
return FALSE;
builder_context_get_arch (context));
if (self->metadata)
{
@ -2872,9 +2870,7 @@ builder_manifest_create_platform (BuilderManifest *self,
ref = flatpak_compose_ref (!self->build_runtime && !self->build_extension,
builder_manifest_get_id_platform (self),
builder_manifest_get_branch (self),
builder_context_get_arch (context), error);
if (ref == NULL)
return FALSE;
builder_context_get_arch (context));
platform_dir = g_file_get_child (app_dir, "platform");