moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Move graph.h functions into graph.c

Browse Source 
So we only need one copy in the final library, not one copy per time
used. Ensure all necessary includes are in place (especially to get the
right size of off_t each time it is compiled) by including "config.h" in
the new graph.c.

One small adjustment here makes the graph_free code more robust- ensure
we don't have invalid pointers after each iteration by looking at the
parents and children and adjusting accordingly.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-04-11 16:45:43 -05:00
parent 8df7208d7b
commit dd8cf0c12d
3 changed files with 63 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/Makefile.am
View File

@ -36,7 +36,7 @@ libalpm_la_SOURCES = \
diskspace.h diskspace.c \
dload.h dload.c \
error.c \
graph.h \
graph.h graph.c \
group.h group.c \
handle.h handle.c \
log.h log.c \

52
lib/libalpm/graph.c Normal file
View File

@ -0,0 +1,52 @@
/*
* graph.c - helpful graph structure and setup/teardown methods
*
* Copyright (c) 2007-2011 Pacman Development Team <pacman-dev@archlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "graph.h"
#include "util.h"
#include "log.h"
pmgraph_t *_alpm_graph_new(void)
{
pmgraph_t *graph = NULL;
CALLOC(graph, 1, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
return graph;
}
void _alpm_graph_free(void *data)
{
pmgraph_t *graph = data;
/* make my children forget about me */
for(alpm_list_t *i = graph->children; i; i = i->next) {
pmgraph_t *child = i->data;
child->parent = NULL;
}
alpm_list_free(graph->children);
/* and make my parents forget about me too */
if(graph->parent) {
alpm_list_t *me = alpm_list_find_ptr(graph->parent->children, &data);
graph->parent->children = alpm_list_remove_item(graph->parent->children,
me);
}
free(graph);
}
/* vim: set ts=2 sw=2 noet: */

30
lib/libalpm/graph.h
View File

@ -1,8 +1,7 @@
/*
* graph.h - helpful graph structure and setup/teardown methods
*
* Copyright (c) 2006-2011 Pacman Development Team <pacman-dev@archlinux.org>
* Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
* Copyright (c) 2007-2011 Pacman Development Team <pacman-dev@archlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -17,34 +16,25 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _ALPM_GRAPH_H
#define _ALPM_GRAPH_H
#include <sys/types.h> /* off_t */
#include "alpm_list.h"
#include "util.h" /* CALLOC() */
struct __pmgraph_t {
typedef struct __pmgraph_t {
char state; /* 0: untouched, -1: entered, other: leaving time */
void *data;
off_t weight; /* weight of the node */
void *data;
struct __pmgraph_t *parent; /* where did we come from? */
alpm_list_t *children;
alpm_list_t *childptr; /* points to a child in children list */
};
typedef struct __pmgraph_t pmgraph_t;
} pmgraph_t;
static pmgraph_t *_alpm_graph_new(void)
{
pmgraph_t *graph = NULL;
pmgraph_t *_alpm_graph_new(void);
void _alpm_graph_free(void *data);
CALLOC(graph, 1, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
return graph;
}
static void _alpm_graph_free(void *data)
{
pmgraph_t *graph = data;
alpm_list_free(graph->children);
free(graph);
}
#endif /* _ALPM_GRAPH_H */
/* vim: set ts=2 sw=2 noet: */