bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libalpm/deps.c : split sortbydeps function.

Browse source 
The _alpm_sortbydeps function has two main part :
1) initialization of the graph structure
2) the sorting itself

So it didn't seem bad to move the first part to a second function.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Chantry Xavier 2007-07-17 14:23:18 +02:00 • committed by Dan McGee
parent 466d289e6a
commit c68d3cc38a
1 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
lib/libalpm/deps.c
View file

@ -107,37 +107,15 @@ int _alpm_depmiss_isin(pmdepmissing_t *needle, alpm_list_t *haystack)
return(0); return(0);
} }
/* Re-order a list of target packages with respect to their dependencies. /* Convert a list of pmpkg_t * to a graph structure,
* * with a edge for each dependency.
* Example (PM_TRANS_TYPE_ADD): * Returns a list of vertices (one vertex = one package)
* A depends on C * (used by alpm_sortbydeps)
* B depends on A
* Target order is A,B,C,D
*
* Should be re-ordered to C,A,B,D
*
* mode should be either PM_TRANS_TYPE_ADD or PM_TRANS_TYPE_REMOVE. This
* affects the dependency order sortbydeps() will use.
*
* This function returns the new alpm_list_t* target list.
*
*/ */
alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode) static alpm_list_t *_alpm_graph_init(alpm_list_t *targets)
{ {
alpm_list_t *newtargs = NULL;
alpm_list_t *i, *j, *k; alpm_list_t *i, *j, *k;
alpm_list_t *vertices = NULL; alpm_list_t *vertices = NULL;
alpm_list_t *vptr;
pmgraph_t *vertex;
ALPM_LOG_FUNC;
if(targets == NULL) {
return(NULL);
}
_alpm_log(PM_LOG_DEBUG, "started sorting dependencies");
/* We create the vertices */ /* We create the vertices */
for(i = targets; i; i = i->next) { for(i = targets; i; i = i->next) {
pmgraph_t *vertex = _alpm_graph_new(); pmgraph_t *vertex = _alpm_graph_new();
@ -159,11 +137,47 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
child = alpm_depcmp(p_j, depend); child = alpm_depcmp(p_j, depend);
free(depend); free(depend);
} }
if(child) vertex_i->children = if(child) {
vertex_i->children =
alpm_list_add(vertex_i->children, vertex_j); alpm_list_add(vertex_i->children, vertex_j);
} }
}
vertex_i->childptr = vertex_i->children; vertex_i->childptr = vertex_i->children;
} }
return(vertices);
}
/* Re-order a list of target packages with respect to their dependencies.
*
* Example (PM_TRANS_TYPE_ADD):
* A depends on C
* B depends on A
* Target order is A,B,C,D
*
* Should be re-ordered to C,A,B,D
*
* mode should be either PM_TRANS_TYPE_ADD or PM_TRANS_TYPE_REMOVE. This
* affects the dependency order sortbydeps() will use.
*
* This function returns the new alpm_list_t* target list.
*
*/
alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
{
alpm_list_t *newtargs = NULL;
alpm_list_t *vertices = NULL;
alpm_list_t *vptr;
pmgraph_t *vertex;
ALPM_LOG_FUNC;
if(targets == NULL) {
return(NULL);
}
_alpm_log(PM_LOG_DEBUG, "started sorting dependencies");
vertices = _alpm_graph_init(targets);
vptr = vertices; vptr = vertices;
vertex = vertices->data; vertex = vertices->data;