3 files changed, 63 insertions, 21 deletions

diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index fb224a59..080ac195 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -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 \
diff --git a/lib/libalpm/graph.c b/lib/libalpm/graph.c
new file mode 100644
index 00000000..2e2ba236
--- /dev/null
+++ b/lib/libalpm/graph.c
@@ -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: */
diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h
index ce195145..ff458230 100644
--- a/lib/libalpm/graph.h
+++ b/lib/libalpm/graph.h
@@ -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;
-
-static pmgraph_t *_alpm_graph_new(void)
-{
-	pmgraph_t *graph = NULL;
+} pmgraph_t;
 
-	CALLOC(graph, 1, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
-	return graph;
-}
+pmgraph_t *_alpm_graph_new(void);
+void _alpm_graph_free(void *data);
 
-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: */