Port rpmostree-builtin-db 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 761e92ab93
commit 79488a76de
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ rpm_ostree_SOURCES = src/app/main.cxx \
src/app/rpmostree-builtin-ex.cxx \
src/app/rpmostree-builtin-testutils.cxx \
src/app/rpmostree-builtin-shlib-backend.cxx \
src/app/rpmostree-builtin-db.c \
src/app/rpmostree-builtin-db.cxx \
src/app/rpmostree-builtin-start-daemon.c \
src/app/rpmostree-builtin-finalize-deployment.c \
src/app/rpmostree-db-builtin-diff.c \

View File

@ -33,7 +33,7 @@ static RpmOstreeCommand rpm_subcommands[] = {
{ "version", RPM_OSTREE_BUILTIN_FLAG_LOCAL_CMD,
"Show rpmdb version of packages within the commits",
rpmostree_db_builtin_version },
{ NULL, 0, NULL, NULL }
{ NULL, (RpmOstreeBuiltinFlags)0, NULL, NULL }
};
static char *opt_repo;
@ -86,7 +86,7 @@ rpmostree_db_option_context_parse (GOptionContext *context,
if (rpmReadConfigFiles (NULL, NULL))
return glnx_throw (error, "rpm failed to init: %s", rpmlogMessage ());
*out_repo = g_steal_pointer (&repo);
*out_repo = util::move_nullify (repo);
return TRUE;
}