X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=b895b7f6fc022e53796707ac64ec8cc672333178;hp=f55fa82b1bda3845c0e5cefd38353e4b4e145366;hb=6d08eb1614b59d5f86a43edda9db06fca72b76cd;hpb=f11c6101f30df645223920bef3eb7592de9bcb79

diff --git a/src/conf.c b/src/conf.c
index f55fa82b..b895b7f6 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3,7 +3,7 @@
     Copyright (C) 1998 Robert van der Meulen
                   1998-2005 Ivo Timmermans
                   2000-2010 Guus Sliepen <guus@tinc-vpn.org>
-                  2010 Julien Muchembled <jm@jmuchemb.eu>
+                  2010-2011 Julien Muchembled <jm@jmuchemb.eu>
 		  2000 Cris van Pelt
 
     This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@ void config_add(avl_tree_t *config_tree, config_t *cfg) {
 	avl_insert(config_tree, cfg);
 }
 
-config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
+config_t *lookup_config(const avl_tree_t *config_tree, char *variable) {
 	config_t cfg, *found;
 
 	cfg.variable = variable;
@@ -110,7 +110,7 @@ config_t *lookup_config(avl_tree_t *config_tree, char *variable) {
 	return found;
 }
 
-config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) {
+config_t *lookup_config_next(const avl_tree_t *config_tree, const config_t *cfg) {
 	avl_node_t *node;
 	config_t *found;
 
@@ -188,7 +188,7 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 }
 
 bool get_config_subnet(const config_t *cfg, subnet_t ** result) {
-	subnet_t subnet = {0};
+	subnet_t subnet = {NULL};
 
 	if(!cfg)
 		return false;
@@ -368,7 +368,7 @@ void read_config_options(avl_tree_t *config_tree, const char *prefix) {
 	}
 }
 
-bool read_server_config() {
+bool read_server_config(void) {
 	char *fname;
 	bool x;