From 515566e4230f74d43d2e7ea1ebe2870bcb45c604 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Mon, 18 Sep 2023 12:35:14 -0500 Subject: [PATCH 1/2] Fix propagating invalid error first_error is never used and doesn't seem needed. --- src/builder-source-file.c | 4 ---- subprojects/debugedit | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/builder-source-file.c b/src/builder-source-file.c index cd67c4f3..ed46f675 100644 --- a/src/builder-source-file.c +++ b/src/builder-source-file.c @@ -341,7 +341,6 @@ download_data_uri (const char *url, GError **error) { CURL *session; - g_autoptr(GError) first_error = NULL; g_autoptr(GInputStream) input = NULL; g_autoptr(GOutputStream) out = NULL; g_autoptr(GUri) parsed = NULL; @@ -356,10 +355,7 @@ download_data_uri (const char *url, out = g_memory_output_stream_new_resizable (); if (!builder_download_uri_buffer (parsed, NULL, session, out, NULL, 0, error)) - { - g_propagate_error (error, g_steal_pointer (&first_error)); return NULL; - } if (!g_output_stream_splice (out, input, diff --git a/subprojects/debugedit b/subprojects/debugedit index 60ee6342..ae27211c 160000 --- a/subprojects/debugedit +++ b/subprojects/debugedit @@ -1 +1 @@ -Subproject commit 60ee6342ffd643523e54629c56dfe1f29d4d63d3 +Subproject commit ae27211cbbfb63a0ad3c141cd1310d7f583ec40e From da74363955c1ea23ca7a2258e58a9bc4b5e8f6d5 Mon Sep 17 00:00:00 2001 From: Patrick Griffis Date: Mon, 18 Sep 2023 12:38:43 -0500 Subject: [PATCH 2/2] Fix incorrect return type --- src/builder-source-file.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/builder-source-file.c b/src/builder-source-file.c index ed46f675..cef7e499 100644 --- a/src/builder-source-file.c +++ b/src/builder-source-file.c @@ -347,9 +347,7 @@ download_data_uri (const char *url, parsed = g_uri_parse(url, CONTEXT_HTTP_URI_FLAGS, error); if (!parsed) - { - return FALSE; - } + return NULL; session = builder_context_get_curl_session (context); out = g_memory_output_stream_new_resizable ();