From 5d68a99a2f59ec1236cf4604874f95d136509b8d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 8 Apr 2021 14:45:28 +0000 Subject: [PATCH] tests: Silence a gcc warning We can't mix `goto` and `__attribute__((cleanup))`. --- tests/test-libarchive-import.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c index 75b298bc..821a8869 100644 --- a/tests/test-libarchive-import.c +++ b/tests/test-libarchive-import.c @@ -510,6 +510,7 @@ test_libarchive_xattr_import_skip_xattr (gconstpointer data) GError *error = NULL; g_autoptr(OtAutoArchiveRead) a = archive_read_new (); OstreeRepoImportArchiveOptions opts = { 0 }; + g_autoptr(OstreeRepoCommitModifier) modifier = NULL; if (skip_if_no_xattr (td)) goto out; @@ -524,7 +525,7 @@ test_libarchive_xattr_import_skip_xattr (gconstpointer data) opts.ignore_unsupported_content = TRUE; - g_autoptr(OstreeRepoCommitModifier) modifier = ostree_repo_commit_modifier_new ( + modifier = ostree_repo_commit_modifier_new ( OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS, NULL, NULL, NULL); if (!import_write_and_ref (td->repo, &opts, a, "baz", modifier, &error)) goto out;