Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=348e0311100c2949f9b9d4a8c6f79ff3bd078913
commit 348e0311100c2949f9b9d4a8c6f79ff3bd078913 Author: Michel Hermier <[email protected]> Date: Sat Jul 26 08:09:14 2014 +0200 libpacman: Previous commits removed broken pointers access to libpacman::Group, so it can be a proper ::flib::FObject now. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index a9373a0..f33b9d6 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -218,9 +218,7 @@ int _pacman_db_load_grpcache(Database *db) Group *grp = _pacman_db_get_grpfromlist(db->grpcache, i->data); if(grp == NULL) { - grp = new Group(); - - STRNCPY(grp->name, (char *)i->data, GRP_NAME_LEN); + grp = new Group((char *)i->data); db->grpcache = _pacman_list_add_sorted(db->grpcache, grp, _pacman_grp_cmp); } if(!_pacman_list_is_strin(pkg->name(), grp->packages)) { diff --git a/lib/libpacman/group.cpp b/lib/libpacman/group.cpp index b449b28..7f902d8 100644 --- a/lib/libpacman/group.cpp +++ b/lib/libpacman/group.cpp @@ -32,10 +32,9 @@ using namespace libpacman; -Group::Group() - : packages(NULL) +Group::Group(const char *name) { - memset(name, 0, sizeof(name)); + STRNCPY(this->name, name, GRP_NAME_LEN); } Group::~Group() diff --git a/lib/libpacman/group.h b/lib/libpacman/group.h index 206a02c..34cf8b3 100644 --- a/lib/libpacman/group.h +++ b/lib/libpacman/group.h @@ -31,10 +31,10 @@ namespace libpacman { class Group -// : public ::flib::FObject // FIXME: Enable when C list search is removed. + : public ::flib::FObject { public: - Group(); + Group(const char *name); ~Group(); char name[GRP_NAME_LEN]; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
