keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lockfile: Drop ror_ prefix

Browse Source 
That's a cbindgen-era thing.
This commit is contained in:
Jonathan Lebon 2021-03-09 15:52:01 -05:00 committed by OpenShift Merge Robot
parent 2fedc3b0ac
commit c03f5d50a3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rust/src/lib.rs
View File

@ -265,8 +265,8 @@ pub mod ffi {
// lockfile.rs
extern "Rust" {
fn ror_lockfile_read(filenames: &Vec<String>) -> Result<Vec<StringMapping>>;
fn ror_lockfile_write(
fn lockfile_read(filenames: &Vec<String>) -> Result<Vec<StringMapping>>;
fn lockfile_write(
filename: &str,
packages: Pin<&mut CxxGObjectArray>,
rpmmd_repos: Pin<&mut CxxGObjectArray>,

4
rust/src/lockfile.rs
View File

@ -242,7 +242,7 @@ use crate::cxxrsutil::CxxResult;
use crate::ffi::*;
use libdnf_sys::*;
pub(crate) fn ror_lockfile_read(filenames: &Vec<String>) -> CxxResult<Vec<StringMapping>> {
pub(crate) fn lockfile_read(filenames: &Vec<String>) -> CxxResult<Vec<StringMapping>> {
Ok(lockfile_parse_multiple(&filenames)?
.packages
.into_iter()
@ -253,7 +253,7 @@ pub(crate) fn ror_lockfile_read(filenames: &Vec<String>) -> CxxResult<Vec<String
.collect())
}
pub(crate) fn ror_lockfile_write(
pub(crate) fn lockfile_write(
filename: &str,
mut packages: Pin<&mut crate::ffi::CxxGObjectArray>,
mut rpmmd_repos: Pin<&mut crate::ffi::CxxGObjectArray>,

4
src/app/rpmostree-compose-builtin-tree.cxx
View File

@ -383,7 +383,7 @@ install_packages (RpmOstreeTreeComposeContext *self,
DNF_REPO_ENABLED_PACKAGES);
auto pkgs_v = rpmostreecxx::CxxGObjectArray(pkgs);
auto repos_v = rpmostreecxx::CxxGObjectArray(rpmmd_repos);
rpmostreecxx::ror_lockfile_write(opt_write_lockfile_to, pkgs_v, repos_v);
rpmostreecxx::lockfile_write(opt_write_lockfile_to, pkgs_v, repos_v);
}
/* FIXME - just do a depsolve here before we compute download requirements */
@ -707,7 +707,7 @@ rpm_ostree_compose_context_new (const char *treefile_pathstr,
rust::Vec<rust::String> lockfiles;
for (char **it = opt_lockfiles; it && *it; it++)
lockfiles.push_back(std::string(*it));
auto mappings = rpmostreecxx::ror_lockfile_read (lockfiles);
auto mappings = rpmostreecxx::lockfile_read (lockfiles);
g_autoptr(GHashTable) map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
for (auto & mapping : mappings)
g_hash_table_insert (map, g_strdup (mapping.k.c_str()), g_strdup (mapping.v.c_str()));