projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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>
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.
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"
*/
#include "config.h"
@@
-39,9
+39,9
@@
#include "xalloc.h"
#include "system.h"
#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;
{
int result;
@@
-53,9
+53,9
@@
int vertex_compare(vertex_t *a, vertex_t *b)
return strcmp(a->to->name, b->to->name);
}
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;
{
int result;
@@
-67,56
+67,56
@@
int vertex_compare(vertex_t *a, vertex_t *b)
void init_vertices(void)
{
cp
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
cp
}
void exit_vertices(void)
{
cp
- avl_delete_tree(
vertex
_tree);
+ avl_delete_tree(
edge
_tree);
cp
}
/* Creation and deletion of connection elements */
cp
}
/* Creation and deletion of connection elements */
-
vertex_t *new_vertex
(void)
+
edge_t *new_edge
(void)
{
cp
{
cp
-
vertex_t *v = (vertex
_t *)xmalloc_and_zero(sizeof(*v));
+
edge_t *v = (edge
_t *)xmalloc_and_zero(sizeof(*v));
cp
return v;
}
cp
return v;
}
-void free_
vertex(vertex
_t *v)
+void free_
edge(edge
_t *v)
{
cp
free(v);
cp
}
{
cp
free(v);
cp
}
-void
vertex_add(vertex
_t *v)
+void
edge_add(edge
_t *v)
{
cp
{
cp
- avl_insert(
vertex
_tree, v);
+ avl_insert(
edge
_tree, v);
cp
}
cp
}
-void
vertex_del(vertex
_t *v)
+void
edge_del(edge
_t *v)
{
cp
{
cp
- avl_delete(
vertex
_tree, v);
+ avl_delete(
edge
_tree, v);
cp
}
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;
cp
v.from = from;
v.to = to;
- result = avl_search(
vertex
_tree, &v);
+ result = avl_search(
edge
_tree, &v);
if(result)
return result;
if(result)
return result;
@@
-124,19
+124,19
@@
cp
v.from = to;
v.to = from;
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;
}
void dump_vertices(void)
{
avl_node_t *node;
-
vertex
_t *v;
+
edge
_t *v;
cp
syslog(LOG_DEBUG, _("Vertices:"));
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);
}
syslog(LOG_DEBUG, _(" %s - %s options %ld"),
v->from->name, v->to->name, v->options);
}