From ccb34865436bae3003afd90c10448172d2369bd0 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Wed, 19 Dec 2018 14:54:18 +0000
Subject: [PATCH] Revert "tests: Fix GOptionContext leak in GSubprocess tests"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 52bab0254a389cafde18c23df05f6f92b4a5c3d8.
It silently conflicted with another commit,
90ca3b4dd04a63be4e963d52021de20cd2219cc0, which was merged later than
it. I’ve kept commit 90ca3b because it also frees the GError; 52bab
doesn’t.
This is my failure to rebase and test old branches before merging them,
instead of assuming that the lack of automatically detected merge
conflicts actually means there are no merge conflicts.
---
gio/tests/gsubprocess-testprog.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/gio/tests/gsubprocess-testprog.c b/gio/tests/gsubprocess-testprog.c
index 6794cb375..c9b06c2a2 100644
--- a/gio/tests/gsubprocess-testprog.c
+++ b/gio/tests/gsubprocess-testprog.c
@@ -209,14 +209,11 @@ main (int argc, char **argv)
if (!ret)
{
- g_option_context_free (context);
g_printerr ("%s: %s\n", argv[0], error->message);
g_error_free (error);
return 1;
}
- g_option_context_free (context);
-
if (argc < 2)
{
g_printerr ("MODE argument required\n");