Reformat all code using astyle.

[tinc] / src / edge.c

diff --git a/src/edge.c b/src/edge.c
index bf43d30..c30d6cc 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,7 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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.27 2003/08/28 21:05:10 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -30,105 +28,80 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *edge_weight_tree;  /* Tree with all edges, sorted on weight */
+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;
 
-       if(result)
+       if(result) {
                return result;
+       }
 
        result = strcmp(a->from->name, b->from->name);
 
-       if(result)
+       if(result) {
                return result;
+       }
 
        return strcmp(a->to->name, b->to->name);
 }
 
-void init_edges(void)
-{
-       cp();
-
+void init_edges(void) {
        edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
 }
 
-avl_tree_t *new_edge_tree(void)
-{
-       cp();
-
+avl_tree_t *new_edge_tree(void) {
        return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge);
 }
 
-void free_edge_tree(avl_tree_t *edge_tree)
-{
-       cp();
-
+void free_edge_tree(avl_tree_t *edge_tree) {
        avl_delete_tree(edge_tree);
 }
 
-void exit_edges(void)
-{
-       cp();
-
+void exit_edges(void) {
        avl_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
-edge_t *new_edge(void)
-{
-       cp();
-
+edge_t *new_edge(void) {
        return xmalloc_and_zero(sizeof(edge_t));
 }
 
-void free_edge(edge_t *e)
-{
-       cp();
-       
+void free_edge(edge_t *e) {
        sockaddrfree(&e->address);
 
        free(e);
 }
 
-void edge_add(edge_t *e)
-{
-       cp();
-
+void edge_add(edge_t *e) {
        avl_insert(edge_weight_tree, e);
        avl_insert(e->from->edge_tree, e);
 
        e->reverse = lookup_edge(e->to, e->from);
 
-       if(e->reverse)
+       if(e->reverse) {
                e->reverse->reverse = e;
+       }
 }
 
-void edge_del(edge_t *e)
-{
-       cp();
-
-       if(e->reverse)
+void edge_del(edge_t *e) {
+       if(e->reverse) {
                e->reverse->reverse = NULL;
+       }
 
        avl_delete(edge_weight_tree, 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();
 
        v.from = from;
        v.to = to;
@@ -136,27 +109,25 @@ 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;
        char *address;
 
-       cp();
-
-       logger(LOG_DEBUG, _("Edges:"));
+       logger(LOG_DEBUG, "Edges:");
 
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
+
                for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
                        e = node2->data;
                        address = sockaddr2hostname(&e->address);
-                       logger(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
-                                  e->from->name, e->to->name, address, e->options, e->weight);
+                       logger(LOG_DEBUG, " %s to %s at %s options %x weight %d",
+                              e->from->name, e->to->name, address, e->options, e->weight);
                        free(address);
                }
        }
 
-       logger(LOG_DEBUG, _("End of edges."));
+       logger(LOG_DEBUG, "End of edges.");
 }