Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=22b99a0f3d3613bccd31fbcec09e197fb703c4d7
commit 22b99a0f3d3613bccd31fbcec09e197fb703c4d7 Author: Michel Hermier <[email protected]> Date: Thu Sep 11 08:15:24 2014 +0200 libpaman: Replace f_ptrlistiterator_count calls with FList::size. diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 6a9f331..f59e54c 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -61,7 +61,7 @@ FPtrList _pacman_checkconflicts(pmtrans_t *trans, const FPtrList &packages) return baddeps; } - howmany = f_ptrlist_count(&packages); + howmany = packages.size(); for(auto i = packages.begin(), end = packages.end(); i != end; ++i) { Package *tp = (Package *)*i; @@ -245,7 +245,7 @@ FPtrList _pacman_db_find_conflicts(pmtrans_t *trans) if(db_local == NULL || trans->packages.empty() || root == NULL) { return conflicts; } - howmany = f_ptrlist_count(&trans->packages); + howmany = trans->packages.size(); /* CHECK 1: check every target against every target */ for(auto i = trans->packages.begin(), end = trans->packages.end(); i != end; ++i) { diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 75c4028..a9f7725 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -138,7 +138,7 @@ int _pacman_localpackage_remove(Package *pkg, pmtrans_t *trans, int howmany, int Handle *handle = trans->m_handle; char line[PATH_MAX+1]; - int filenum = f_ptrlist_count(&pkg->files()); + int filenum = pkg->files().size(); _pacman_log(PM_LOG_FLOW1, _("removing files")); /* iterate through the list backwards, unlinking files */ diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 6eadddc..d600819 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -81,7 +81,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) STRNCPY(info->m_version, ptr, sizeof(info->m_version)); } else if(!strcmp(key, "PKGDESC")) { info->desc_localized.add(ptr); - if(f_ptrlist_count(&info->desc_localized) == 1) { + if(info->desc_localized.size() == 1) { STRNCPY(info->m_description, ptr, sizeof(info->m_description)); } else if (!strncmp(ptr, handle->language, strlen(handle->language))) { STRNCPY(info->m_description, ptr+strlen(handle->language)+1, sizeof(info->m_description)); diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 4e516ba..11ded89 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -1296,7 +1296,7 @@ int pacman_list_count(pmlist_t *list) { ASSERT(list != NULL, return(-1)); - return f_ptrlist_count(cxx_cast(list)); + return cxx_cast(list)->size(); } /** Free a list iterator. diff --git a/lib/libpacman/server.cpp b/lib/libpacman/server.cpp index c0ace47..c44bd70 100644 --- a/lib/libpacman/server.cpp +++ b/lib/libpacman/server.cpp @@ -376,7 +376,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, const FPtrList &servers, const } if(howmany) { - *howmany = f_ptrlist_count(&files); + *howmany = files.size(); } if(remain) { *remain = 1; @@ -575,7 +575,7 @@ int _pacman_downloadfiles_forreal(Handle *handle, const FPtrList &servers, const } } - if(f_ptrlist_count(&complete) == f_ptrlist_count(&files)) { + if(complete.size() == files.size()) { done = 1; } } diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 04292e3..7bb01f6 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1650,7 +1650,7 @@ int __pmtrans_t::commit(FPtrList **data) } else { time_t t; - howmany = f_ptrlist_count(&packages); + howmany = packages.size(); for(auto targ = packages.begin(), end = packages.end(); targ != end; ++targ) { Package *pkg_new = NULL, *pkg_local = NULL; diff --git a/lib/libpacman/util/fptrlist.cpp b/lib/libpacman/util/fptrlist.cpp index 39cb9d8..bcac608 100644 --- a/lib/libpacman/util/fptrlist.cpp +++ b/lib/libpacman/util/fptrlist.cpp @@ -151,11 +151,7 @@ int f_ptrlist_clear(FPtrList *list, FVisitor *visitor) size_t f_ptrlist_count(const FPtrList *self) { if(self != NULL) { -#ifndef F_NOCOMPAT - return f_ptrlistiterator_count(self->begin(), self->end()); -#else return self->size(); -#endif } return 0; } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
