X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=95e7f7e03eb76b5fb5f803c703c8a34fe85dc108;hp=3bceb00433581aaf50983d67469329c7364d90b0;hb=ae50b0077e27c4c4d81a98da46c66865ffa069be;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/edge.c b/src/edge.c
index 3bceb004..95e7f7e0 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -17,37 +17,27 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: edge.c,v 1.1.2.21 2003/07/12 17:41:45 guus Exp $
+    $Id: edge.c,v 1.1.2.24 2003/07/29 10:50:15 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
-#include "net.h"				/* Don't ask. */
-#include "netutl.h"
-#include "conf.h"
-#include <utils.h>
-#include "subnet.h"
+#include "avl_tree.h"
 #include "edge.h"
-#include "node.h"
 #include "logger.h"
-
+#include "netutl.h"
+#include "node.h"
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
 avl_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
 
-static int edge_compare(edge_t *a, edge_t *b)
+static int edge_compare(const edge_t *a, const edge_t *b)
 {
 	return strcmp(a->to->name, b->to->name);
 }
 
-static int edge_weight_compare(edge_t *a, edge_t *b)
+static int edge_weight_compare(const edge_t *a, const edge_t *b)
 {
 	int result;
 
@@ -135,13 +125,13 @@ void edge_del(edge_t *e)
 
 edge_t *lookup_edge(node_t *from, node_t *to)
 {
-	edge_t v;
+	edge_t v = {
+		.from = from,
+		.to = to
+	};
 
 	cp();
 
-	v.from = from;
-	v.to = to;
-
 	return avl_search(from->edge_tree, &v);
 }