Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d6e54aaa2cc407c1fa0b3331ec7e4367a2d5c387
commit d6e54aaa2cc407c1fa0b3331ec7e4367a2d5c387 Author: Michel Hermier <[email protected]> Date: Wed Sep 3 07:37:40 2014 +0200 libpacman: Make pmgraph_t::children not a pointer. diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 69e44e9..195ce16 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -55,7 +55,7 @@ static pmgraph_t *_pacman_graph_new(void) static void _pacman_graph_free(void *data) { pmgraph_t *graph = data; - FREELISTPTR(graph->children); + graph->children.clear(); free(graph); } @@ -148,10 +148,10 @@ FPtrList *_pacman_sortbydeps(FPtrList *targets, int mode) child = _pacman_depcmp(p_j, &depend); } if(child) { - vertex_i->children = vertex_i->children->add(vertex_j); + vertex_i->children.add(vertex_j); } } - vertex_i->childptr = vertex_i->children->begin(); + vertex_i->childptr = vertex_i->children.begin(); } vptr = vertices->begin(); diff --git a/lib/libpacman/deps.h b/lib/libpacman/deps.h index e85cdd4..0e03c5c 100644 --- a/lib/libpacman/deps.h +++ b/lib/libpacman/deps.h @@ -45,7 +45,7 @@ typedef struct __pmgraph_t { int state; /* 0: untouched, -1: entered, other: leaving time */ void *data; struct __pmgraph_t *parent; /* where did we come from? */ - FPtrList *children; + FPtrList children; FPtrListIterator *childptr; /* points to a child in children list */ } pmgraph_t; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
