From 761e92ab933d48cd7ee712bb3a21bf86961cacdc Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 21 Dec 2020 16:08:51 +0000 Subject: [PATCH] Port rpmostree-builtin-shlib-backend to C++ Prep for using https://cxx.rs/ --- Makefile-rpm-ostree.am | 2 +- ...ltin-shlib-backend.c => rpmostree-builtin-shlib-backend.cxx} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/app/{rpmostree-builtin-shlib-backend.c => rpmostree-builtin-shlib-backend.cxx} (98%) diff --git a/Makefile-rpm-ostree.am b/Makefile-rpm-ostree.am index 19897e23..4f07d081 100644 --- a/Makefile-rpm-ostree.am +++ b/Makefile-rpm-ostree.am @@ -40,7 +40,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \ src/app/rpmostree-builtin-status.cxx \ src/app/rpmostree-builtin-ex.cxx \ src/app/rpmostree-builtin-testutils.cxx \ - src/app/rpmostree-builtin-shlib-backend.c \ + src/app/rpmostree-builtin-shlib-backend.cxx \ src/app/rpmostree-builtin-db.c \ src/app/rpmostree-builtin-start-daemon.c \ src/app/rpmostree-builtin-finalize-deployment.c \ diff --git a/src/app/rpmostree-builtin-shlib-backend.c b/src/app/rpmostree-builtin-shlib-backend.cxx similarity index 98% rename from src/app/rpmostree-builtin-shlib-backend.c rename to src/app/rpmostree-builtin-shlib-backend.cxx index 05276f8a..979e5142 100644 --- a/src/app/rpmostree-builtin-shlib-backend.c +++ b/src/app/rpmostree-builtin-shlib-backend.cxx @@ -71,7 +71,7 @@ impl_packagelist_from_commit (OstreeRepo *repo, const char *commit, GError **err { if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) return g_variant_new_maybe ((GVariantType*) RPMOSTREE_SHLIB_IPC_PKGLIST, NULL); - g_propagate_error (error, g_steal_pointer (&local_error)); + g_propagate_error (error, util::move_nullify (local_error)); return NULL; }