projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanups:
[tinc]
/
src
/
edge.c
diff --git
a/src/edge.c
b/src/edge.c
index
4a000e8
..
e35d806
100644
(file)
--- a/
src/edge.c
+++ b/
src/edge.c
@@
-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: edge.c,v 1.1.2.1
3 2002/09/06 10:23:52
guus Exp $
+ $Id: edge.c,v 1.1.2.1
5 2002/09/09 19:39:58
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-56,36
+56,41
@@
int edge_weight_compare(edge_t *a, edge_t *b)
if(result)
return result;
if(result)
return result;
- else
- return edge_compare(a, b);
+
+ result = strcmp(a->from->name, b->from->name);
+
+ if(result)
+ return result;
+
+ return strcmp(a->to->name, b->to->name);
}
void init_edges(void)
{
}
void init_edges(void)
{
-cp
+ cp();
edge_weight_tree = avl_alloc_tree((avl_compare_t)edge_weight_compare, NULL);
edge_weight_tree = avl_alloc_tree((avl_compare_t)edge_weight_compare, NULL);
-cp
+ cp();
}
avl_tree_t *new_edge_tree(void)
{
}
avl_tree_t *new_edge_tree(void)
{
-cp
+ cp();
return avl_alloc_tree((avl_compare_t)edge_compare, NULL);
return avl_alloc_tree((avl_compare_t)edge_compare, NULL);
-cp
+ cp();
}
void free_edge_tree(avl_tree_t *edge_tree)
{
}
void free_edge_tree(avl_tree_t *edge_tree)
{
-cp
+ cp();
avl_delete_tree(edge_tree);
avl_delete_tree(edge_tree);
-cp
+ cp();
}
void exit_edges(void)
{
}
void exit_edges(void)
{
-cp
+ cp();
avl_delete_tree(edge_weight_tree);
avl_delete_tree(edge_weight_tree);
-cp
+ cp();
}
/* Creation and deletion of connection elements */
}
/* Creation and deletion of connection elements */
@@
-93,46
+98,46
@@
cp
edge_t *new_edge(void)
{
edge_t *e;
edge_t *new_edge(void)
{
edge_t *e;
-cp
+ cp();
e = (edge_t *)xmalloc_and_zero(sizeof(*e));
e = (edge_t *)xmalloc_and_zero(sizeof(*e));
-cp
+ cp();
return e;
}
void free_edge(edge_t *e)
{
return e;
}
void free_edge(edge_t *e)
{
-cp
+ cp();
free(e);
free(e);
-cp
+ cp();
}
void edge_add(edge_t *e)
{
}
void edge_add(edge_t *e)
{
-cp
+ cp();
avl_insert(edge_weight_tree, e);
avl_insert(e->from->edge_tree, e);
avl_insert(edge_weight_tree, e);
avl_insert(e->from->edge_tree, e);
-cp
+ cp();
e->reverse = lookup_edge(e->to, e->from);
if(e->reverse)
e->reverse->reverse = e;
e->reverse = lookup_edge(e->to, e->from);
if(e->reverse)
e->reverse->reverse = e;
-cp
+ cp();
}
void edge_del(edge_t *e)
{
}
void edge_del(edge_t *e)
{
-cp
+ cp();
if(e->reverse)
e->reverse->reverse = NULL;
if(e->reverse)
e->reverse->reverse = NULL;
-cp
+ cp();
avl_delete(edge_weight_tree, e);
avl_delete(e->from->edge_tree, e);
avl_delete(edge_weight_tree, e);
avl_delete(e->from->edge_tree, e);
-cp
+ cp();
}
edge_t *lookup_edge(node_t *from, node_t *to)
{
edge_t v;
}
edge_t *lookup_edge(node_t *from, node_t *to)
{
edge_t v;
-cp
+ cp();
v.from = from;
v.to = to;
v.from = from;
v.to = to;
@@
-145,7
+150,7
@@
void dump_edges(void)
node_t *n;
edge_t *e;
char *address;
node_t *n;
edge_t *e;
char *address;
-cp
+ cp();
syslog(LOG_DEBUG, _("Edges:"));
for(node = node_tree->head; node; node = node->next)
syslog(LOG_DEBUG, _("Edges:"));
for(node = node_tree->head; node; node = node->next)
@@
-163,5
+168,5
@@
cp
}
syslog(LOG_DEBUG, _("End of edges."));
}
syslog(LOG_DEBUG, _("End of edges."));
-cp
+ cp();
}
}