From 7f5dada8851c3b40ba44ed92e46315cefa9006b2 Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Sat, 3 Mar 2007 08:13:59 +0000 Subject: Big commit this time: * Moved entirely to alpm_pkg_get_* accessors, to read data on demand * Mostly removed the INFRQ_ parameters from outside the be_files backend (making the backend more extensible in the long run) * packages created from _alpm_db_scan now have the db and origin set (making accessors actually work for these packages) * removed _alpm_db_ensure_pkgcache * totally revamped the _alpm_checkconflicts function, making it cleaner and easier to read (and thus fix in the long run) - maintainable code ftw NOTE: feel free to rename the functions... I couldn't think of anything better * removed an extra loop in sync.c:find_replacements - no sense in looping over an entire DB while strcmp'ing the name, when we have get_pkgfromcache Other: * package struct "license" -> "licenses" * Created _alpm_sync_find (duplicate code in some places, find_pkginsync * Minor const correctness changes along the way * fixed a couple extra '/' pathing issues (non-issues really) * removed a duplicate pkg_cmp function --- src/pacman/trans.c | 4 ++-- src/pacman/trans.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pacman/trans.c b/src/pacman/trans.c index ede9b78d..4af0aa41 100644 --- a/src/pacman/trans.c +++ b/src/pacman/trans.c @@ -277,8 +277,8 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, } } -void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent, - const int howmany, const int remain) +void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, + int howmany, int remain) { float timediff; diff --git a/src/pacman/trans.h b/src/pacman/trans.h index 63ff4714..85e122c4 100644 --- a/src/pacman/trans.h +++ b/src/pacman/trans.h @@ -29,8 +29,8 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, void *data3, int *response); /* callback to handle display of the progress bar for transactions */ -void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent, - const int howmany, const int remain); +void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, + int howmany, int remain); #endif /* _PM_TRANS_H */ -- cgit v1.2.3-24-g4f1b