Port rpmostree-unpacker-core to C++

Prep for using https://cxx.rs/
This commit is contained in:
Colin Walters 2020-12-21 16:08:51 +00:00 committed by OpenShift Merge Robot
parent a03b5a26d7
commit 88624692fb
2 changed files with 2 additions and 2 deletions

View File

@ -44,7 +44,7 @@ librpmostreepriv_sources = \
src/libpriv/rpmostree-rpm-util.h \ src/libpriv/rpmostree-rpm-util.h \
src/libpriv/rpmostree-importer.c \ src/libpriv/rpmostree-importer.c \
src/libpriv/rpmostree-importer.h \ 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-unpacker-core.h \
src/libpriv/rpmostree-output.cxx \ src/libpriv/rpmostree-output.cxx \
src/libpriv/rpmostree-output.h \ src/libpriv/rpmostree-output.h \

View File

@ -99,7 +99,7 @@ rpmostree_unpack_rpm2cpio (int fd, GError **error)
success = TRUE; success = TRUE;
out: out:
if (success) if (success)
return g_steal_pointer (&ret); return util::move_nullify (ret);
else else
{ {
if (ret) if (ret)