emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transaction_ops: shortest static function name.

Browse Source
This commit is contained in:
Juan RP 2012-11-15 09:25:59 +01:00
parent ce2f45a3df
commit 1b217d1906
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/transaction_ops.c
View File

@ -58,12 +58,8 @@ enum {
}; };
static int static int
transaction_find_pkg(struct xbps_handle *xhp, trans_find_pkg(struct xbps_handle *xhp, const char *pkg, bool bypattern,
const char *pkg, bool best, bool exact, int action)
bool bypattern,
bool best,
bool exact,
int action)
{ {
prop_dictionary_t pkg_pkgdb, pkg_repod; prop_dictionary_t pkg_pkgdb, pkg_repod;
prop_array_t unsorted; prop_array_t unsorted;
@ -223,8 +219,8 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
foundhold = false; foundhold = false;
continue; continue;
} }
rv = transaction_find_pkg(xhp, pkgname, false, true, rv = trans_find_pkg(xhp, pkgname, false, true,
false, TRANS_UPDATE); false, TRANS_UPDATE);
if (rv == 0) if (rv == 0)
newpkg_found = true; newpkg_found = true;
else if (rv == ENOENT || rv == EEXIST || rv == ENODEV) { else if (rv == ENOENT || rv == EEXIST || rv == ENODEV) {
@ -242,8 +238,7 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
int int
xbps_transaction_update_pkg(struct xbps_handle *xhp, const char *pkgname) xbps_transaction_update_pkg(struct xbps_handle *xhp, const char *pkgname)
{ {
return transaction_find_pkg(xhp, pkgname, false, return trans_find_pkg(xhp, pkgname, false, true, false, TRANS_UPDATE);
true, false, TRANS_UPDATE);
} }
int int
@ -255,7 +250,6 @@ xbps_transaction_install_pkg(struct xbps_handle *xhp,
pkg_state_t state; pkg_state_t state;
char *pkgname; char *pkgname;
bool bypattern, best, exact; bool bypattern, best, exact;
int rv;
if (xbps_pkgpattern_version(pkg)) { if (xbps_pkgpattern_version(pkg)) {
bypattern = true; bypattern = true;
@ -285,8 +279,8 @@ xbps_transaction_install_pkg(struct xbps_handle *xhp,
return EEXIST; return EEXIST;
} }
} }
rv = transaction_find_pkg(xhp, pkg, bypattern, best, exact, TRANS_INSTALL);
return rv; return trans_find_pkg(xhp, pkg, bypattern, best, exact, TRANS_INSTALL);
} }
int int