Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=ffd5c4041781a28c81b016482665146a386584b1
commit ffd5c4041781a28c81b016482665146a386584b1 Author: Michel Hermier <[email protected]> Date: Wed Sep 3 07:41:39 2014 +0200 libpacman: Make Group::packages not a pointer. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index 478fce3..9bd198c 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -184,8 +184,8 @@ int _pacman_db_load_grpcache(Database *db) grp = new Group(grp_name); f_ptrlist_add_sorted(&db->grpcache, grp, _pacman_grp_cmp); } - if(!_pacman_list_is_strin(pkg->name(), grp->packages)) { - grp->packages = f_ptrlist_add_sorted(grp->packages, pkg->name(), strcmp); + if(!_pacman_list_is_strin(pkg->name(), &grp->packages)) { + f_ptrlist_add_sorted(&grp->packages, pkg->name(), strcmp); } } } diff --git a/lib/libpacman/group.cpp b/lib/libpacman/group.cpp index aa3c006..7099518 100644 --- a/lib/libpacman/group.cpp +++ b/lib/libpacman/group.cpp @@ -38,9 +38,7 @@ Group::Group(const char *name) } Group::~Group() -{ - f_ptrlist_delete(packages, NULL); -} +{ } void _pacman_grp_delete(Group *grp) { diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h index e617ab0..671636c 100644 --- a/lib/libpacman/group.h +++ b/lib/libpacman/group.h @@ -39,7 +39,7 @@ public: ~Group(); char name[GRP_NAME_LEN]; - FPtrList *packages; /* List of unowned strings */ + FPtrList packages; /* List of unowned strings */ }; } diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 8ad74b4..40be7bc 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -917,7 +917,7 @@ void *pacman_grp_getinfo(pmgrp_t *grp, unsigned char parm) switch(parm) { case PM_GRP_NAME: data = group->name; break; - case PM_GRP_PKGNAMES: data = group->packages; break; + case PM_GRP_PKGNAMES: data = &group->packages; break; default: data = NULL; break; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
