Reformat all code using astyle.

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index 0eb9760..817c2cb 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,10 @@
+#ifndef TINC_CONF_H
+#define TINC_CONF_H
+
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -18,11 +21,9 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_CONF_H__
-#define __TINC_CONF_H__
-
-#include "splay_tree.h"
 #include "list.h"
+#include "splay_tree.h"
+#include "subnet.h"
 
 typedef struct config_t {
        char *variable;
@@ -31,7 +32,6 @@ typedef struct config_t {
        int line;
 } config_t;
 
-#include "subnet.h"
 
 extern splay_tree_t *config_tree;
 
@@ -39,13 +39,11 @@ extern int pinginterval;
 extern int pingtimeout;
 extern int maxtimeout;
 extern bool bypass_security;
-extern char *confbase;
-extern char *netname;
 extern list_t *cmdline_conf;
 
 extern void init_configuration(splay_tree_t **);
 extern void exit_configuration(splay_tree_t **);
-extern config_t *new_config(void) __attribute__ ((__malloc__));
+extern config_t *new_config(void) __attribute__((__malloc__));
 extern void free_config(config_t *);
 extern void config_add(splay_tree_t *, config_t *);
 extern config_t *lookup_config(splay_tree_t *, char *);
@@ -63,4 +61,4 @@ extern bool read_server_config(void);
 extern bool read_host_config(splay_tree_t *, const char *);
 extern bool append_config_file(const char *, const char *, const char *);
 
-#endif                                                 /* __TINC_CONF_H__ */
+#endif