diff --git a/bin/xbps-cmpver/main.c b/bin/xbps-cmpver/main.c index 91960d4391..40bcf76077 100644 --- a/bin/xbps-cmpver/main.c +++ b/bin/xbps-cmpver/main.c @@ -17,5 +17,5 @@ int main(int argc, char **argv) return 1; } - return xbps_cmpver_packages(argv[1], argv[2]); + return xbps_cmpver(argv[1], argv[2]); } diff --git a/bin/xbps-repo/index.c b/bin/xbps-repo/index.c index 152270c61f..1f93749fbd 100644 --- a/bin/xbps-repo/index.c +++ b/bin/xbps-repo/index.c @@ -165,7 +165,7 @@ repoidx_addpkg(const char *file, const char *filename, const char *pkgdir) if (curpkgd) { prop_dictionary_get_cstring_nocopy(curpkgd, "version", ®ver); - if (xbps_cmpver_versions(version, regver) <= 0) { + if (xbps_cmpver(version, regver) <= 0) { printf("Skipping %s. Version %s already " "registered.\n", filename, regver); prop_object_release(newpkgd); diff --git a/include/xbps_api.h b/include/xbps_api.h index caead1c4cf..777fa27ba6 100644 --- a/include/xbps_api.h +++ b/include/xbps_api.h @@ -67,8 +67,7 @@ #endif /* from lib/cmpver.c */ -int xbps_cmpver_packages(const char *, const char *); -int xbps_cmpver_versions(const char *, const char *); +int xbps_cmpver(const char *, const char *); /* From lib/fexec.c */ int xbps_file_exec(const char *, ...); diff --git a/lib/cmpver.c b/lib/cmpver.c index e3874332a4..5206c39a26 100644 --- a/lib/cmpver.c +++ b/lib/cmpver.c @@ -225,7 +225,7 @@ get_component(const char *position, version_component *component) * multiple components, separated by a period, including letters. */ int -xbps_cmpver_packages(const char *pkg1, const char *pkg2) +xbps_cmpver(const char *pkg1, const char *pkg2) { const char *v1, *v2, *ve1, *ve2; unsigned long e1, e2, r1, r2; @@ -281,11 +281,3 @@ xbps_cmpver_packages(const char *pkg1, const char *pkg2) return result; } - -int -xbps_cmpver_versions(const char *inst, const char *req) -{ - int res = xbps_cmpver_packages(inst, req); - - return res; -} diff --git a/lib/findpkg.c b/lib/findpkg.c index 7b6b0cc8fb..d7015027c9 100644 --- a/lib/findpkg.c +++ b/lib/findpkg.c @@ -224,7 +224,7 @@ xbps_find_new_pkg(const char *pkgname, prop_dictionary_t instpkg) "version", &instver); prop_dictionary_get_cstring_nocopy(pkgrd, "version", &repover); - if (xbps_cmpver_versions(instver, repover) >= 0) + if (xbps_cmpver(instver, repover) >= 0) goto out; break; diff --git a/lib/util.c b/lib/util.c index d43301d25f..d8f29e799b 100644 --- a/lib/util.c +++ b/lib/util.c @@ -132,7 +132,7 @@ xbps_check_is_installed_pkg(const char *pkg) prop_dictionary_get_cstring_nocopy(dict, "version", &instver); /* Compare installed and required version. */ - rv = xbps_cmpver_versions(instver, reqver); + rv = xbps_cmpver(instver, reqver); free(pkgname); prop_object_release(dict);