Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=08199bf6359a42ab69856024b0cf11b6c8bbdcad
commit 08199bf6359a42ab69856024b0cf11b6c8bbdcad Author: Michel Hermier <[email protected]> Date: Fri May 2 07:56:39 2014 +0200 libpacman: Remove all PM_PKG_DEPENDS usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index 512b954..9a3b85a 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -68,7 +68,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) } else if(strncmp("version", p, q-p) == 0) { STRNCPY(dummy->m_version, q+1, PKG_VERSION_LEN); } else if(strncmp("depend", p, q-p) == 0) { - dummy->depends = _pacman_stringlist_append(dummy->depends, q+1); + dummy->m_depends = _pacman_stringlist_append(dummy->m_depends, q+1); } else { _pacman_log(PM_LOG_ERROR, _("could not parse token %s"), p); } diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 0438c39..c360ac3 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -433,7 +433,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) retval = -1; goto cleanup; } - _pacman_localdb_write_stringlist("DEPENDS", info->depends, fp); + _pacman_localdb_write_stringlist("DEPENDS", info->depends(), fp); _pacman_localdb_write_stringlist("REQUIREDBY", info->requiredby(), fp); _pacman_localdb_write_stringlist("CONFLICTS", info->conflicts(), fp); _pacman_localdb_write_stringlist("PROVIDES", info->provides(), fp); diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index 0717af4..8db0578 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -194,7 +194,7 @@ int _pacman_localdb_depends_fread(Package *info, FILE *fp) } f_strtrim(line); if(!strcmp(line, "%DEPENDS%")) { - _pacman_db_read_lines(&info->depends, line, sline, fp); + _pacman_db_read_lines(&info->m_depends, line, sline, fp); } else if(!strcmp(line, "%REQUIREDBY%")) { _pacman_db_read_lines(&info->m_requiredby, line, sline, fp); } else if(!strcmp(line, "%CONFLICTS%")) { diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index e743a52..9432d71 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -143,7 +143,7 @@ pmlist_t *_pacman_sortbydeps(pmlist_t *targets, int mode) pmgraph_t *vertex_j = j->data; Package *p_j = vertex_j->data; int child = 0; - for(k = p_i->getinfo(PM_PKG_DEPENDS); k && !child; k = k->next) { + for(k = p_i->depends(); k && !child; k = k->next) { pmdepend_t depend; _pacman_splitdep(k->data, &depend); child = _pacman_depcmp(p_j, &depend); @@ -247,7 +247,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag /* this package is also in the upgrade list, so don't worry about it */ continue; } - for(k = p->getinfo(PM_PKG_DEPENDS); k; k = k->next) { + for(k = p->depends(); k; k = k->next) { /* don't break any existing dependencies (possible provides) */ _pacman_splitdep(k->data, &depend); if(_pacman_depcmp(oldpkg, &depend) && !_pacman_depcmp(tp, &depend)) { @@ -273,7 +273,7 @@ pmlist_t *_pacman_checkdeps(pmtrans_t *trans, unsigned char op, pmlist_t *packag continue; } - for(j = tp->getinfo(PM_PKG_DEPENDS); j; j = j->next) { + for(j = tp->depends(); j; j = j->next) { /* split into name/version pairs */ _pacman_splitdep((char *)j->data, &depend); found = 0; @@ -505,7 +505,7 @@ pmlist_t *_pacman_removedeps(Database *db, pmlist_t *targs) } for(i = targs; i; i = i->next) { - for(j = ((Package *)i->data)->getinfo(PM_PKG_DEPENDS); j; j = j->next) { + for(j = ((Package *)i->data)->depends(); j; j = j->next) { pmdepend_t depend; Package *dep; int needed = 0; @@ -772,7 +772,7 @@ int pacman_output_generate(pmlist_t *targets, pmlist_t *dblist) { targets = _pacman_list_remove(targets, (void*) pname, str_cmp, (void **)&match); if(match) { foundMatch = 1; - for(k = pkg->getinfo(PM_PKG_DEPENDS); k; k = k->next) { + for(k = pkg->depends(); k; k = k->next) { char *fullDep = (char *)k->data; pmdepend_t depend; if(_pacman_splitdep(fullDep, &depend)) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index c291334..15a35b3 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -90,7 +90,7 @@ Package::Package(const libpacman::Package &other) m_conflicts = _pacman_list_strdup(other.m_conflicts); files = _pacman_list_strdup(other.files); backup = _pacman_list_strdup(other.backup); - depends = _pacman_list_strdup(other.depends); + m_depends = _pacman_list_strdup(other.m_depends); removes = _pacman_list_strdup(other.removes); groups = _pacman_list_strdup(other.groups); m_provides = _pacman_list_strdup(other.m_provides); @@ -109,7 +109,7 @@ Package::~Package() FREELIST(desc_localized); FREELIST(files); FREELIST(backup); - FREELIST(depends); + FREELIST(m_depends); FREELIST(removes); FREELIST(m_conflicts); FREELIST(m_requiredby); @@ -413,7 +413,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_STICK: data = (void *)(long)stick; break; case PM_PKG_MD5SUM: data = md5sum; break; case PM_PKG_SHA1SUM: data = sha1sum; break; - case PM_PKG_DEPENDS: data = depends; break; + case PM_PKG_DEPENDS: data = m_depends; break; case PM_PKG_REMOVES: data = removes; break; case PM_PKG_REQUIREDBY: data = m_requiredby; break; case PM_PKG_PROVIDES: data = m_provides; break; @@ -589,7 +589,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((flags & PM_PACKAGE_FLAG_GROUPS) && f_stringlist_any_match(pkg->groups, strmatcher)) || ((flags & PM_PACKAGE_FLAG_FILES) && f_stringlist_any_match(pkg->files, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BACKUP) && f_stringlist_any_match(pkg->backup, strmatcher)) || - ((flags & PM_PACKAGE_FLAG_DEPENDS) && f_stringlist_any_match(pkg->depends, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_DEPENDS) && f_stringlist_any_match(pkg->m_depends, strmatcher)) || ((flags & PM_PACKAGE_FLAG_REMOVES) && f_stringlist_any_match(pkg->removes, strmatcher)) || ((flags & PM_PACKAGE_FLAG_REQUIREDBY) && f_stringlist_any_match(pkg->m_requiredby, strmatcher)) || ((flags & PM_PACKAGE_FLAG_CONFLITS) && f_stringlist_any_match(pkg->m_conflicts, strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index c6d6415..e34331b 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -148,7 +148,7 @@ public: FStringList *groups; FStringList *files; FStringList *backup; - FStringList *depends; + FStringList *m_depends; FStringList *removes; FStringList *m_requiredby; FStringList *m_conflicts; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 36015e6..d898f00 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -112,7 +112,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) STRNCPY(tmp, ptr, sizeof(tmp)); info->usize = atol(tmp); } else if(!strcmp(key, "DEPEND")) { - info->depends = f_stringlist_append(info->depends, ptr); + info->m_depends = f_stringlist_append(info->m_depends, ptr); } else if(!strcmp(key, "REMOVE")) { info->removes = f_stringlist_append(info->removes, ptr); } else if(!strcmp(key, "CONFLICT")) { diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index b910c06..4b51c0f 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -20,6 +20,7 @@ */ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) +LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) LIBPACMAN_PACKAGE_PROPERTY(const char *, name, NAME ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides, PROVIDES ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, requiredby, REQUIREDBY) diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index 0de59a5..20c981b 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -542,7 +542,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) } /* Look through the upset package's dependencies and try to match one up * to a provisio from the package we want to remove */ - for(k = conflictp->depends; k && !pfound; k = k->next) { + for(k = conflictp->depends(); k && !pfound; k = k->next) { pmlist_t *m; for(m = leavingp->provides(); m && !pfound; m = m->next) { if(!strcmp(k->data, m->data)) { @@ -731,7 +731,7 @@ int _pacman_sync_commit(pmtrans_t *trans, pmlist_t **data) * here. */ continue; } - for(m = depender->depends; m; m = m->next) { + for(m = depender->depends(); m; m = m->next) { if(!strcmp(m->data, old->name())) { FREE(m->data); m->data = strdup(pkg_new->name()); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index e8a318d..2114f5d 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1168,7 +1168,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) if(tmpp == NULL) { continue; } - for(tmppm = tmpp->depends; tmppm; tmppm = tmppm->next) { + for(tmppm = tmpp->depends(); tmppm; tmppm = tmppm->next) { pmdepend_t depend; if(_pacman_splitdep(tmppm->data, &depend)) { continue; @@ -1197,10 +1197,10 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) } /* update dependency packages' REQUIREDBY fields */ - if(pkg_new->depends) { + if(pkg_new->depends()) { _pacman_log(PM_LOG_FLOW2, _("updating dependency packages 'requiredby' fields")); } - for(lp = pkg_new->depends; lp; lp = lp->next) { + for(lp = pkg_new->depends(); lp; lp = lp->next) { Package *depinfo; pmdepend_t depend; if(_pacman_splitdep(lp->data, &depend)) { @@ -1327,7 +1327,7 @@ int _pacman_remove_commit(pmtrans_t *trans, pmlist_t **data) /* update dependency packages' REQUIREDBY fields */ _pacman_log(PM_LOG_FLOW2, _("updating dependency packages 'requiredby' fields")); - for(lp = pkg_local->depends; lp; lp = lp->next) { + for(lp = pkg_local->depends(); lp; lp = lp->next) { Package *depinfo = NULL; pmdepend_t depend; char *data; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
