diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-09-15 18:06:47 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-09-30 14:20:53 +0200 |
| commit | 4e263f24c6ed1cc710b7873b9ea37534117247ea (patch) | |
| tree | afdf105036af29f6830f2bcbe1b9f2308f85f2d8 /lib/libalpm/sync.c | |
| parent | 13c9745302b11dcee7b1b894d95789a2caf11c9d (diff) | |
| download | pacman-4e263f24c6ed1cc710b7873b9ea37534117247ea.tar.gz pacman-4e263f24c6ed1cc710b7873b9ea37534117247ea.tar.xz | |
libalpm: export alpm_splitdep as alpm_dep_from_depstring and alpm_dep_free
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 4c74a3a0..f040eee6 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -524,8 +524,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) conflict->package1, conflict->package2); /* if sync1 provides sync2, we remove sync2 from the targets, and vice versa */ - alpm_depend_t *dep1 = _alpm_splitdep(conflict->package1); - alpm_depend_t *dep2 = _alpm_splitdep(conflict->package2); + alpm_depend_t *dep1 = alpm_dep_from_string(conflict->package1); + alpm_depend_t *dep2 = alpm_dep_from_string(conflict->package2); if(_alpm_depcmp(sync1, dep2)) { rsync = sync2; sync = sync1; @@ -544,12 +544,12 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } alpm_list_free_inner(deps, (alpm_list_fn_free)alpm_conflict_free); alpm_list_free(deps); - _alpm_dep_free(dep1); - _alpm_dep_free(dep2); + alpm_dep_free(dep1); + alpm_dep_free(dep2); goto cleanup; } - _alpm_dep_free(dep1); - _alpm_dep_free(dep2); + alpm_dep_free(dep1); + alpm_dep_free(dep2); /* Prints warning */ _alpm_log(handle, ALPM_LOG_WARNING, |