j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

K&R style braces.

Browse source 
This is essentially commit f02d3ed3e1 from the
1.1 branch, making it easier to merge between master and 1.1.
This commit is contained in:
Guus Sliepen 2009-09-25 00:14:03 +02:00
parent ab7c61b06f
commit 5dde6461a3
32 changed files with 271 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/edge.c
View file

@ -30,13 +30,11 @@
avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */
static int edge_compare(const edge_t *a, const 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(const edge_t *a, const edge_t *b)
{
static int edge_weight_compare(const edge_t *a, const edge_t *b) {
int result;
result = a->weight - b->weight;
@ -52,29 +50,25 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b)
return strcmp(a->to->name, b->to->name);
}
void init_edges(void)
{
void init_edges(void) {
cp();
edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
}
avl_tree_t *new_edge_tree(void)
{
avl_tree_t *new_edge_tree(void) {
cp();
return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge);
}
void free_edge_tree(avl_tree_t *edge_tree)
{
void free_edge_tree(avl_tree_t *edge_tree) {
cp();
avl_delete_tree(edge_tree);
}
void exit_edges(void)
{
void exit_edges(void) {
cp();
avl_delete_tree(edge_weight_tree);
@ -82,15 +76,13 @@ void exit_edges(void)
/* Creation and deletion of connection elements */
edge_t *new_edge(void)
{
edge_t *new_edge(void) {
cp();
return xmalloc_and_zero(sizeof(edge_t));
}
void free_edge(edge_t *e)
{
void free_edge(edge_t *e) {
cp();
sockaddrfree(&e->address);
@ -98,8 +90,7 @@ void free_edge(edge_t *e)
free(e);
}
void edge_add(edge_t *e)
{
void edge_add(edge_t *e) {
cp();
avl_insert(edge_weight_tree, e);
@ -111,8 +102,7 @@ void edge_add(edge_t *e)
e->reverse->reverse = e;
}
void edge_del(edge_t *e)
{
void edge_del(edge_t *e) {
cp();
if(e->reverse)
@ -122,8 +112,7 @@ void edge_del(edge_t *e)
avl_delete(e->from->edge_tree, e);
}
edge_t *lookup_edge(node_t *from, node_t *to)
{
edge_t *lookup_edge(node_t *from, node_t *to) {
edge_t v;
cp();
@ -134,8 +123,7 @@ edge_t *lookup_edge(node_t *from, node_t *to)
return avl_search(from->edge_tree, &v);
}
void dump_edges(void)
{
void dump_edges(void) {
avl_node_t *node, *node2;
node_t *n;
edge_t *e;