[glib: 1/2] Revert "tests: Fix GOptionContext leak in GSubprocess tests"



commit ccb34865436bae3003afd90c10448172d2369bd0
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Dec 19 14:54:18 2018 +0000

    Revert "tests: Fix GOptionContext leak in GSubprocess tests"
    
    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");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]