K&R style braces.

[tinc] / src / subnet.c

diff --git a/src/subnet.c b/src/subnet.c
index 140b614..fa1ee63 100644 (file)
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -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$
+    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"
@@ -56,8 +54,7 @@ void subnet_cache_flush() {
 
 /* Subnet comparison */
 
-static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
        int result;
 
        result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
@@ -73,8 +70,7 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
        return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
        int result;
 
        result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
@@ -95,8 +91,7 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
        return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
        int result;
 
        result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
@@ -117,8 +112,7 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
        return strcmp(a->owner->name, b->owner->name);
 }
 
-int subnet_compare(const subnet_t *a, const subnet_t *b)
-{
+int subnet_compare(const subnet_t *a, const subnet_t *b) {
        int result;
 
        result = a->type - b->type;
@@ -145,8 +139,7 @@ int subnet_compare(const subnet_t *a, const subnet_t *b)
 
 /* Initialising trees */
 
-void init_subnets(void)
-{
+void init_subnets(void) {
        cp();
 
        subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
@@ -154,22 +147,19 @@ void init_subnets(void)
        subnet_cache_flush();
 }
 
-void exit_subnets(void)
-{
+void exit_subnets(void) {
        cp();
 
        avl_delete_tree(subnet_tree);
 }
 
-avl_tree_t *new_subnet_tree(void)
-{
+avl_tree_t *new_subnet_tree(void) {
        cp();
 
        return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t *subnet_tree)
-{
+void free_subnet_tree(avl_tree_t *subnet_tree) {
        cp();
 
        avl_delete_tree(subnet_tree);
@@ -177,15 +167,13 @@ void free_subnet_tree(avl_tree_t *subnet_tree)
 
 /* Allocating and freeing space for subnets */
 
-subnet_t *new_subnet(void)
-{
+subnet_t *new_subnet(void) {
        cp();
 
        return xmalloc_and_zero(sizeof(subnet_t));
 }
 
-void free_subnet(subnet_t *subnet)
-{
+void free_subnet(subnet_t *subnet) {
        cp();
 
        free(subnet);
@@ -193,8 +181,7 @@ void free_subnet(subnet_t *subnet)
 
 /* Adding and removing subnets */
 
-void subnet_add(node_t *n, subnet_t *subnet)
-{
+void subnet_add(node_t *n, subnet_t *subnet) {
        cp();
 
        subnet->owner = n;
@@ -205,8 +192,7 @@ void subnet_add(node_t *n, subnet_t *subnet)
        subnet_cache_flush();
 }
 
-void subnet_del(node_t *n, subnet_t *subnet)
-{
+void subnet_del(node_t *n, subnet_t *subnet) {
        cp();
 
        avl_delete(n->subnet_tree, subnet);
@@ -217,8 +203,7 @@ void subnet_del(node_t *n, subnet_t *subnet)
 
 /* Ascii representation of subnets */
 
-bool str2net(subnet_t *subnet, const char *subnetstr)
-{
+bool str2net(subnet_t *subnet, const char *subnetstr) {
        int i, l;
        uint16_t x[8];
        int weight = 10;
@@ -299,8 +284,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
        return false;
 }
 
-bool net2str(char *netstr, int len, const subnet_t *subnet)
-{
+bool net2str(char *netstr, int len, const subnet_t *subnet) {
        cp();
 
        if(!netstr || !subnet) {
@@ -357,15 +341,13 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
-{
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
        cp();
 
        return avl_search(owner->subnet_tree, subnet);
 }
 
-subnet_t *lookup_subnet_mac(const mac_t *address)
-{
+subnet_t *lookup_subnet_mac(const mac_t *address) {
        subnet_t *p, subnet = {0};
 
        cp();
@@ -379,8 +361,7 @@ subnet_t *lookup_subnet_mac(const mac_t *address)
        return p;
 }
 
-subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
-{
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
        subnet_t *p, *r = NULL, subnet = {0};
        avl_node_t *n;
        int i;
@@ -426,8 +407,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
        return r;
 }
 
-subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
-{
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
        subnet_t *p, *r = NULL, subnet = {0};
        avl_node_t *n;
        int i;
@@ -540,8 +520,7 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
                free(envp[i]);
 }
 
-void dump_subnets(void)
-{
+void dump_subnets(void) {
        char netstr[MAXNETSTR];
        subnet_t *subnet;
        avl_node_t *node;