Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=adae695b685ed14261041ae32e9dfffcc777f4a8
commit adae695b685ed14261041ae32e9dfffcc777f4a8 Author: Michel Hermier <[email protected]> Date: Thu May 9 10:55:55 2013 +0200 libpacman: Remove ambiquity aroude pmpkg_t::data. Remove last unused *_DATA value accessors from header. diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c index 9660dc8..4ffbae3 100644 --- a/lib/libpacman/cache.c +++ b/lib/libpacman/cache.c @@ -66,7 +66,7 @@ int _pacman_db_load_pkgcache(pmdb_t *db) _pacman_db_rewind(db); while((info = _pacman_db_scan(db, NULL, inforeq)) != NULL) { info->origin = PKG_FROM_CACHE; - info->data = db; + info->db = db; /* add to the collective */ db->pkgcache = f_list_add_sorted(db->pkgcache, info, (FCompareFunc)_pacman_pkg_cmp, NULL); } @@ -175,7 +175,7 @@ int _pacman_db_load_grpcache(pmdb_t *db) pmpkg_t *pkg = lp->data; if(!(pkg->infolevel & INFRQ_DESC)) { - _pacman_db_read(pkg->data, INFRQ_DESC, pkg); + _pacman_db_read(pkg->db, INFRQ_DESC, pkg); } for(i = pkg->groups; i; i = i->next) { diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index c0f6b65..acc226e 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -43,6 +43,7 @@ #include "cache.h" #include "pacman.h" +#include "fstring.h" #include "fstringlist.h" /* Test if a package is valid. @@ -74,9 +75,7 @@ void __pacman_pkg_fini (FObject *obj) { FREELIST(pkg->groups); FREELIST(pkg->provides); FREELIST(pkg->replaces); - if(pkg->origin == PKG_FROM_FILE) { - FREE(pkg->data); - } + free (pkg->archive_path); } static const @@ -115,6 +114,7 @@ pmpkg_t *_pacman_pkg_dup(pmpkg_t *pkg) } __pacman_file_init (&newpkg->base, &_pacman_pkg_ops); + newpkg->db = pkg->db; STRNCPY(newpkg->name, pkg->name, PKG_NAME_LEN); STRNCPY(newpkg->version, pkg->version, PKG_VERSION_LEN); STRNCPY(newpkg->desc, pkg->desc, PKG_DESC_LEN); @@ -145,7 +145,7 @@ pmpkg_t *_pacman_pkg_dup(pmpkg_t *pkg) newpkg->replaces = f_stringlist_deep_copy(pkg->replaces); /* internal */ newpkg->origin = pkg->origin; - newpkg->data = (newpkg->origin == PKG_FROM_FILE) ? strdup(pkg->data) : pkg->data; + newpkg->archive_path = f_strdup (pkg->archive_path); newpkg->infolevel = pkg->infolevel; return(newpkg); @@ -412,7 +412,7 @@ pmpkg_t *_pacman_pkg_load(const char *pkgfile) /* internal */ info->origin = PKG_FROM_FILE; - info->data = strdup(pkgfile); + info->archive_path = strdup(pkgfile); info->infolevel = 0xFF; if (__pacman_pkg_isvalid (info) != 0) { @@ -526,7 +526,7 @@ void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm) case PM_PKG_FORCE: if(!(pkg->infolevel & INFRQ_DESC)) { _pacman_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - _pacman_db_read(pkg->data, INFRQ_DESC, pkg); + _pacman_db_read(pkg->db, INFRQ_DESC, pkg); } break; /* Depends entry */ @@ -536,22 +536,22 @@ void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm) case PM_PKG_PROVIDES: if(!(pkg->infolevel & INFRQ_DEPENDS)) { _pacman_log(PM_LOG_DEBUG, "loading DEPENDS info for '%s'", pkg->name); - _pacman_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _pacman_db_read(pkg->db, INFRQ_DEPENDS, pkg); } break; /* Files entry */ case PM_PKG_FILES: case PM_PKG_BACKUP: - if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { + if(pkg->db == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { _pacman_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), pkg->name); - _pacman_db_read(pkg->data, INFRQ_FILES, pkg); + _pacman_db_read(pkg->db, INFRQ_FILES, pkg); } break; /* Scriptlet */ case PM_PKG_SCRIPLET: - if(pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) { + if(pkg->db == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPLET)) { _pacman_log(PM_LOG_DEBUG, _("loading SCRIPLET info for '%s'"), pkg->name); - _pacman_db_read(pkg->data, INFRQ_SCRIPLET, pkg); + _pacman_db_read(pkg->db, INFRQ_SCRIPLET, pkg); } break; } @@ -585,7 +585,6 @@ void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm) case PM_PKG_FILES: data = pkg->files; break; case PM_PKG_BACKUP: data = pkg->backup; break; case PM_PKG_SCRIPLET: data = (void *)(long)pkg->scriptlet; break; - case PM_PKG_DATA: data = pkg->data; break; default: data = NULL; break; diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 649200f..8432e4e 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -52,6 +52,7 @@ enum { typedef struct __pmpkg_t { struct pmfile base; + struct __pmdb_t *db; char name[PKG_NAME_LEN]; char version[PKG_VERSION_LEN]; char desc[PKG_DESC_LEN]; @@ -83,7 +84,7 @@ typedef struct __pmpkg_t { pmlist_t *provides; /* internal */ unsigned char origin; - void *data; + char *archive_path; unsigned char infolevel; } pmpkg_t; diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index ba03bb0..b447edc 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -581,7 +581,6 @@ void *pacman_sync_getinfo(pmsyncpkg_t *ps, unsigned char parm) switch(parm) { case PM_SYNC_TYPE: data = (void *)(long)ps->type; break; case PM_SYNC_PKG: data = ps->pkg_new != NULL ? ps->pkg_new : ps->pkg_local; break; - case PM_SYNC_DATA: data = ps->replaces; break; /* FIXME: change the name */ default: data = NULL; break; diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 54c6c47..01aa58e 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -196,7 +196,6 @@ enum { /* Sciplet */ PM_PKG_SCRIPLET, /* Misc */ - PM_PKG_DATA, PM_PKG_FORCE, PM_PKG_STICK }; @@ -238,7 +237,6 @@ void *pacman_grp_getinfo(PM_GRP *grp, unsigned char parm); enum { PM_SYNC_TYPE = 1, PM_SYNC_PKG, - PM_SYNC_DATA }; void *pacman_sync_getinfo(PM_SYNCPKG *sync, unsigned char parm); diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index 1cc5952..b13117a 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -302,7 +302,7 @@ int _pacman_trans_download_commit(pmtrans_t *trans, pmlist_t **data) for(j = trans->packages; j; j = j->next) { pmsyncpkg_t *ps = j->data; pmpkg_t *spkg = ps->pkg_new; - pmdb_t *dbs = spkg->data; + pmdb_t *dbs = spkg->db; if(current == dbs) { char filename[PATH_MAX]; diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index 7560357..cea95fb 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -285,7 +285,7 @@ pmtranspkg_t *_pacman_trans_add (pmtrans_t *trans, pmtranspkg_t *transpkg) { /* Check if an transaction packages already exist for the same package, * and if so try to compress it */ - if ((transpkg_in = __pacman_trans_get_trans_pkg(trans, transpkg_name)) != NULL) { + if ((transpkg_in = __pacman_trans_get_trans_pkg (trans, transpkg_name)) != NULL) { /* If both transpkg tries to install (or upgrade), let's compress the transpkg. */ /* FIXME: do something with transpkg->flags */ if (transpkg_in->type & PM_TRANS_TYPE_ADD && @@ -1340,8 +1340,9 @@ int _pacman_trans_commit(pmtrans_t *trans, pmlist_t **data) event = &trans_event_table[transtype]; EVENT(trans, event->pre.event, info, NULL); if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { - _pacman_runscriptlet(handle->root, info->data, event->pre.hook, info->version, local ? local->version : NULL, - trans); + /* FIXME: check that it is really info->archive_path that whas expected */ + _pacman_runscriptlet (handle->root, info->archive_path, event->pre.hook, info->version, + local ? local->version : NULL, trans); } if (transtype & PM_TRANS_TYPE_REMOVE) { @@ -1397,7 +1398,7 @@ int _pacman_trans_commit(pmtrans_t *trans, pmlist_t **data) archive_read_support_compression_all (archive); archive_read_support_format_all (archive); - if (archive_read_open_file (archive, info->data, PM_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + if (archive_read_open_file (archive, info->archive_path, PM_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { RET_ERR(PM_ERR_PKG_OPEN, -1); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
