tinc-gui: Reformat codebase according to PEP8

[tinc] / src / conf.h

diff --git a/src/conf.h b/src/conf.h
index cc57e82..4f39b20 100644 (file)
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,7 +1,7 @@
 /*
     conf.h -- header for conf.c
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2009 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
@@ -39,8 +39,6 @@ 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 **);
@@ -60,9 +58,7 @@ extern config_t *parse_config_line(char *, const char *, int);
 extern bool read_config_file(splay_tree_t *, const char *);
 extern void read_config_options(splay_tree_t *, const char *);
 extern bool read_server_config(void);
-extern bool read_connection_config(struct connection_t *);
-extern FILE *ask_and_open(const char *, const char *, const char *);
-extern bool is_safe_path(const char *);
-extern bool disable_old_keys(FILE *);
+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 /* __TINC_CONF_H__ */