Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ef2ef466318dbd6b0488b267af14d13c0f24eeea
commit ef2ef466318dbd6b0488b267af14d13c0f24eeea Author: Michel Hermier <[email protected]> Date: Wed May 22 14:03:43 2013 +0200 libpacman: Remove _pacman_pkg_dup, this was used in paths to have a clean copy in cache, but in the end the purpose is unecessary. diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c index 4ffbae3..c21ada7 100644 --- a/lib/libpacman/cache.c +++ b/lib/libpacman/cache.c @@ -105,18 +105,11 @@ pmlist_t *_pacman_db_get_pkgcache(pmdb_t *db) int _pacman_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) { - pmpkg_t *newpkg; - if(db == NULL || pkg == NULL) { return(-1); } - - newpkg = _pacman_pkg_dup(pkg); - if(newpkg == NULL) { - return(-1); - } - _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), newpkg->name, db->treename); - db->pkgcache = f_list_add_sorted(db->pkgcache, newpkg, (FCompareFunc)_pacman_pkg_cmp, NULL); + _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), pkg->name, db->treename); + db->pkgcache = f_list_add_sorted(db->pkgcache, pkg, (FCompareFunc)_pacman_pkg_cmp, NULL); _pacman_db_free_grpcache(db); diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index 34a97c7..d0356fa 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -105,52 +105,6 @@ pmpkg_t *_pacman_pkg_new(const char *name, const char *version) return(pkg); } -pmpkg_t *_pacman_pkg_dup(pmpkg_t *pkg) -{ - pmpkg_t* newpkg = _pacman_malloc(sizeof(pmpkg_t)); - - if(newpkg == NULL) { - return(NULL); - } - __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); - STRNCPY(newpkg->url, pkg->url, PKG_URL_LEN); - STRNCPY(newpkg->builddate, pkg->builddate, PKG_DATE_LEN); - STRNCPY(newpkg->buildtype, pkg->buildtype, PKG_DATE_LEN); - STRNCPY(newpkg->installdate, pkg->installdate, PKG_DATE_LEN); - STRNCPY(newpkg->packager, pkg->packager, PKG_PACKAGER_LEN); - STRNCPY(newpkg->md5sum, pkg->md5sum, PKG_MD5SUM_LEN); - STRNCPY(newpkg->sha1sum, pkg->sha1sum, PKG_SHA1SUM_LEN); - STRNCPY(newpkg->arch, pkg->arch, PKG_ARCH_LEN); - newpkg->size = pkg->size; - newpkg->usize = pkg->usize; - newpkg->force = pkg->force; - newpkg->stick = pkg->stick; - newpkg->scriptlet = pkg->scriptlet; - newpkg->reason = pkg->reason; - newpkg->license = f_stringlist_deep_copy(pkg->license); - newpkg->desc_localized = f_stringlist_deep_copy(pkg->desc_localized); - newpkg->requiredby = f_stringlist_deep_copy(pkg->requiredby); - newpkg->conflicts = f_stringlist_deep_copy(pkg->conflicts); - newpkg->files = f_stringlist_deep_copy(pkg->files); - newpkg->backup = f_stringlist_deep_copy(pkg->backup); - newpkg->depends = f_stringlist_deep_copy(pkg->depends); - newpkg->removes = f_stringlist_deep_copy(pkg->removes); - newpkg->groups = f_stringlist_deep_copy(pkg->groups); - newpkg->provides = f_stringlist_deep_copy(pkg->provides); - newpkg->replaces = f_stringlist_deep_copy(pkg->replaces); - /* internal */ - newpkg->origin = pkg->origin; - newpkg->archive_path = f_strdup (pkg->archive_path); - newpkg->infolevel = pkg->infolevel; - - return(newpkg); -} - void _pacman_pkg_free(pmpkg_t *pkg) { f_object_delete (&pkg->base.base); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 0cb3f11..8ca3268 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -99,7 +99,6 @@ do { \ #define FREELISTPKGS(p) _FREELIST(p, _pacman_pkg_free) pmpkg_t* _pacman_pkg_new(const char *name, const char *version); -pmpkg_t *_pacman_pkg_dup(pmpkg_t *pkg); void _pacman_pkg_free(pmpkg_t *pkg); int _pacman_pkg_cmp(const void *p1, const void *p2); diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index ec6a950..bd70dd5 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -208,7 +208,7 @@ pmpkg_t *_pacman_db_search_provider(pmdb_t *db, const char *name) { if (p == NULL) { RET_ERR(PM_ERR_PKG_NOT_FOUND, NULL); } - pkg = _pacman_pkg_dup(p->data); + pkg = p->data; FREELISTPTR(p); _pacman_log(PM_LOG_DEBUG, _("found '%s' as a provision for '%s' in database '%S'"), pkg->name, name, db->treename); return pkg; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
