Move graph.h functions into graph.c

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>

1 files changed, 10 insertions, 20 deletions

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: */