Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=682563f42df6553fc2cbb84e9bf8375fa59e9e93
commit 682563f42df6553fc2cbb84e9bf8375fa59e9e93 Author: Michel Hermier <[email protected]> Date: Fri May 2 11:13:39 2014 +0200 libpacman: Remove all PM_PKG_FILES usage outside of package.cpp and pacman.cpp. diff --git a/lib/libpacman/conflict.cpp b/lib/libpacman/conflict.cpp index 98ac23b..13aaeae 100644 --- a/lib/libpacman/conflict.cpp +++ b/lib/libpacman/conflict.cpp @@ -282,7 +282,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski for(j = i; j; j = j->next) { Package *p2 = (Package*)j->data; if(strcmp(p1->name(), p2->name())) { - pmlist_t *ret = chk_fileconflicts(p1->files, p2->files); + pmlist_t *ret = chk_fileconflicts(p1->files(), p2->files()); for(k = ret; k; k = k->next) { pmconflict_t *conflict = _pacman_malloc(sizeof(pmconflict_t)); if(conflict == NULL) { @@ -301,7 +301,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski /* CHECK 2: check every target against the filesystem */ p = (Package*)i->data; dbpkg = NULL; - for(j = p->files; j; j = j->next) { + for(j = p->files(); j; j = j->next) { filestr = (char*)j->data; snprintf(path, PATH_MAX, "%s%s", root, filestr); /* is this target a file or directory? */ @@ -323,7 +323,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name()); db_local->read(dbpkg, INFRQ_FILES); } - if(dbpkg && _pacman_list_is_strin(j->data, dbpkg->files)) { + if(dbpkg && _pacman_list_is_strin(j->data, dbpkg->files())) { ok = 1; } /* Check if the conflicting file has been moved to another package/target */ @@ -340,7 +340,7 @@ pmlist_t *_pacman_db_find_conflicts(pmtrans_t *trans, char *root, pmlist_t **ski db_local->read(dbpkg2, INFRQ_FILES); } /* If it used to exist in there, but doesn't anymore */ - if(dbpkg2 && !_pacman_list_is_strin(filestr, p2->files) && _pacman_list_is_strin(filestr, dbpkg2->files)) { + if(dbpkg2 && !_pacman_list_is_strin(filestr, p2->files()) && _pacman_list_is_strin(filestr, dbpkg2->files())) { ok = 1; /* Add to the "skip list" of files that we shouldn't remove during an upgrade. * diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 6872f9d..a183b8d 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -419,7 +419,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) retval = -1; goto cleanup; } - _pacman_localdb_write_stringlist("FILES", info->files, fp); + _pacman_localdb_write_stringlist("FILES", info->files(), fp); _pacman_localdb_write_stringlist("BACKUP", info->backup, fp); fclose(fp); fp = NULL; diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index 8b2f435..fa2d617 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -237,7 +237,7 @@ int _pacman_localdb_files_fread(Package *info, FILE *fp) /* just ignore the content after the pipe for now */ *ptr = '\0'; } - info->files = f_stringlist_append(info->files, line); + info->m_files = f_stringlist_append(info->m_files, line); } } else if(!strcmp(line, "%BACKUP%")) { while(fgets(line, sline, fp) && !_pacman_strempty(f_strtrim(line))) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 204034f..112fc81 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -88,7 +88,7 @@ Package::Package(const libpacman::Package &other) desc_localized = _pacman_list_strdup(other.desc_localized); m_requiredby = _pacman_list_strdup(other.m_requiredby); m_conflicts = _pacman_list_strdup(other.m_conflicts); - files = _pacman_list_strdup(other.files); + m_files = _pacman_list_strdup(other.m_files); backup = _pacman_list_strdup(other.backup); m_depends = _pacman_list_strdup(other.m_depends); removes = _pacman_list_strdup(other.removes); @@ -107,7 +107,7 @@ Package::~Package() { FREELIST(license); FREELIST(desc_localized); - FREELIST(files); + FREELIST(m_files); FREELIST(backup); FREELIST(m_depends); FREELIST(removes); @@ -418,7 +418,7 @@ void *Package::getinfo(unsigned char parm) case PM_PKG_REQUIREDBY: data = m_requiredby; break; case PM_PKG_PROVIDES: data = m_provides; break; case PM_PKG_CONFLICTS: data = m_conflicts; break; - case PM_PKG_FILES: data = files; break; + case PM_PKG_FILES: data = m_files; break; case PM_PKG_BACKUP: data = backup; break; case PM_PKG_SCRIPLET: data = (void *)(long)scriptlet; break; case PM_PKG_DATA: data = this->data; break; @@ -455,7 +455,7 @@ pmlist_t *_pacman_pkg_getowners(const char *filename) info = lp->data; - for(i = info->getinfo(PM_PKG_FILES); i; i = i->next) { + for(i = info->files(); i; i = i->next) { char path[PATH_MAX]; snprintf(path, PATH_MAX, "%s%s", handle->root, (char *)i->data); @@ -587,7 +587,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { ((flags & PM_PACKAGE_FLAG_LICENSE) && f_stringlist_any_match(pkg->license, strmatcher)) || ((flags & PM_PACKAGE_FLAG_REPLACES) && f_stringlist_any_match(pkg->m_replaces, strmatcher)) || ((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_FILES) && f_stringlist_any_match(pkg->m_files, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BACKUP) && f_stringlist_any_match(pkg->backup, 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)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 96122b9..0f7b62d 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -146,7 +146,7 @@ public: FStringList *license; FStringList *m_replaces; FStringList *groups; - FStringList *files; + FStringList *m_files; FStringList *backup; FStringList *m_depends; FStringList *removes; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 9d0b537..856d453 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -211,7 +211,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) continue; } f_strtrim(str); - info->files = _pacman_stringlist_append(info->files, str); + info->m_files = _pacman_stringlist_append(info->m_files, str); } FREE(str); fclose(filelist); @@ -222,7 +222,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) /* no .FILELIST present in this package.. build the filelist the */ /* old-fashioned way, one at a time */ expath = strdup(archive_entry_pathname (entry)); - info->files = _pacman_list_add(info->files, expath); + info->m_files = _pacman_list_add(info->m_files, expath); } } diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 81f3dad..96e373f 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -21,6 +21,7 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) +LIBPACMAN_PACKAGE_PROPERTY(FStringList *, files, FILES ) LIBPACMAN_PACKAGE_PROPERTY(const char *, name, NAME ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, provides, PROVIDES ) LIBPACMAN_PACKAGE_PROPERTY(unsigned char, reason, REASON ) diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 38e3b9a..20c4107 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -964,11 +964,11 @@ int _pacman_localpackage_remove(Package *pkg, pmtrans_t *trans, int howmany, int int position = 0; char line[PATH_MAX+1]; - int filenum = _pacman_list_count(pkg->files); + int filenum = _pacman_list_count(pkg->files()); _pacman_log(PM_LOG_FLOW1, _("removing files")); /* iterate through the list backwards, unlinking files */ - for(lp = _pacman_list_last(pkg->files); lp; lp = lp->prev) { + for(lp = _pacman_list_last(pkg->files()); lp; lp = lp->prev) { int nb = 0; double percent = 0; char *file = lp->data; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
