What was I thinking? s/vertex/edge/g.

[tinc] / src / edge.c

diff --git a/src/vertex.c b/src/edge.c
similarity index 68%
rename from src/vertex.c
rename to src/edge.c
index 9e72f9e..24c67c3 100644 (file)
--- a/src/vertex.c
+++ b/src/edge.c
@@ -1,5 +1,5 @@
 /*
-    vertex.c -- vertex tree management
+    edge.c -- edge tree management
     Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
                   2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
 
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: vertex.c,v 1.1.2.3 2001/10/27 13:13:35 guus Exp $
+    $Id: edge.c,v 1.1.2.1 2001/10/28 08:41:19 guus Exp $
 */
 
 #include "config.h"
@@ -39,9 +39,9 @@
 #include "xalloc.h"
 #include "system.h"
 
-avl_tree_t *vertex_tree;        /* Tree with all known vertices (replaces active_tree) */
+avl_tree_t *edge_tree;        /* Tree with all known vertices (replaces active_tree) */
 
-int vertex_compare(vertex_t *a, vertex_t *b)
+int edge_compare(edge_t *a, edge_t *b)
 {
   int result;
 
@@ -53,9 +53,9 @@ int vertex_compare(vertex_t *a, vertex_t *b)
     return strcmp(a->to->name, b->to->name);
 }
 
-/* Evil vertex_compare() from a parallel universe ;)
+/* Evil edge_compare() from a parallel universe ;)
 
-int vertex_compare(vertex_t *a, vertex_t *b)
+int edge_compare(edge_t *a, edge_t *b)
 {
   int result;
 
@@ -67,56 +67,56 @@ int vertex_compare(vertex_t *a, vertex_t *b)
 void init_vertices(void)
 {
 cp
-  vertex_tree = avl_alloc_tree((avl_compare_t)vertex_compare, NULL);
+  edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
 cp
 }
 
 void exit_vertices(void)
 {
 cp
-  avl_delete_tree(vertex_tree);
+  avl_delete_tree(edge_tree);
 cp
 }
 
 /* Creation and deletion of connection elements */
 
-vertex_t *new_vertex(void)
+edge_t *new_edge(void)
 {
 cp
-  vertex_t *v = (vertex_t *)xmalloc_and_zero(sizeof(*v));
+  edge_t *v = (edge_t *)xmalloc_and_zero(sizeof(*v));
 cp
   return v;
 }
 
-void free_vertex(vertex_t *v)
+void free_edge(edge_t *v)
 {
 cp
   free(v);
 cp
 }
 
-void vertex_add(vertex_t *v)
+void edge_add(edge_t *v)
 {
 cp
-  avl_insert(vertex_tree, v);
+  avl_insert(edge_tree, v);
 cp
 }
 
-void vertex_del(vertex_t *v)
+void edge_del(edge_t *v)
 {
 cp
-  avl_delete(vertex_tree, v);
+  avl_delete(edge_tree, v);
 cp
 }
 
-vertex_t *lookup_vertex(node_t *from, node_t *to)
+edge_t *lookup_edge(node_t *from, node_t *to)
 {
-  vertex_t v, *result;
+  edge_t v, *result;
 cp
   v.from = from;
   v.to = to;
 
-  result = avl_search(vertex_tree, &v);
+  result = avl_search(edge_tree, &v);
 
   if(result)
     return result;
@@ -124,19 +124,19 @@ cp
   v.from = to;
   v.to = from;
 
-  return avl_search(vertex_tree, &v);
+  return avl_search(edge_tree, &v);
 }
 
 void dump_vertices(void)
 {
   avl_node_t *node;
-  vertex_t *v;
+  edge_t *v;
 cp
   syslog(LOG_DEBUG, _("Vertices:"));
 
-  for(node = vertex_tree->head; node; node = node->next)
+  for(node = edge_tree->head; node; node = node->next)
     {
-      v = (vertex_t *)node->data;
+      v = (edge_t *)node->data;
       syslog(LOG_DEBUG, _(" %s - %s options %ld"),
              v->from->name, v->to->name, v->options);
     }