From 88624692fb2f6bb246aa54e773c518499ea9bbb7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 21 Dec 2020 16:08:51 +0000 Subject: [PATCH] Port rpmostree-unpacker-core to C++ Prep for using https://cxx.rs/ --- Makefile-libpriv.am | 2 +- .../{rpmostree-unpacker-core.c => rpmostree-unpacker-core.cxx} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/libpriv/{rpmostree-unpacker-core.c => rpmostree-unpacker-core.cxx} (98%) diff --git a/Makefile-libpriv.am b/Makefile-libpriv.am index 6267928f..b3d54f50 100644 --- a/Makefile-libpriv.am +++ b/Makefile-libpriv.am @@ -44,7 +44,7 @@ librpmostreepriv_sources = \ src/libpriv/rpmostree-rpm-util.h \ src/libpriv/rpmostree-importer.c \ src/libpriv/rpmostree-importer.h \ - src/libpriv/rpmostree-unpacker-core.c \ + src/libpriv/rpmostree-unpacker-core.cxx \ src/libpriv/rpmostree-unpacker-core.h \ src/libpriv/rpmostree-output.cxx \ src/libpriv/rpmostree-output.h \ diff --git a/src/libpriv/rpmostree-unpacker-core.c b/src/libpriv/rpmostree-unpacker-core.cxx similarity index 98% rename from src/libpriv/rpmostree-unpacker-core.c rename to src/libpriv/rpmostree-unpacker-core.cxx index 060eb0ba..753fcd9c 100644 --- a/src/libpriv/rpmostree-unpacker-core.c +++ b/src/libpriv/rpmostree-unpacker-core.cxx @@ -99,7 +99,7 @@ rpmostree_unpack_rpm2cpio (int fd, GError **error) success = TRUE; out: if (success) - return g_steal_pointer (&ret); + return util::move_nullify (ret); else { if (ret)