projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No C99 initialisers, gcc 2.95.3 doesn't like it.
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
d34a087
..
4a44443
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,7
+19,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.6
8 2003/07/22 20:55:19
guus Exp $
+ $Id: conf.c,v 1.9.4.6
9 2003/07/24 12:08:15
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-37,7
+37,7
@@
int pingtimeout = 0; /* seconds before timeout */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
char *confbase = NULL; /* directory in which all config files are */
char *netname = NULL; /* name of the vpn network */
-static int config_compare(con
fig_t *a,
config_t *b)
+static int config_compare(con
st config_t *a, const
config_t *b)
{
int result;
{
int result;
@@
-99,7
+99,7
@@
void config_add(avl_tree_t *config_tree, config_t *cfg)
avl_insert(config_tree, 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;
{
config_t cfg, *found;
@@
-120,7
+120,7
@@
config_t *lookup_config(avl_tree_t *config_tree, char *variable)
return found;
}
return found;
}
-config_t *lookup_config_next(
avl_tree_t *config_tree,
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;
{
avl_node_t *node;
config_t *found;
@@
-141,7
+141,7
@@
config_t *lookup_config_next(avl_tree_t *config_tree, config_t *cfg)
return NULL;
}
return NULL;
}
-bool get_config_bool(config_t *cfg, bool *result)
+bool get_config_bool(con
st con
fig_t *cfg, bool *result)
{
cp();
{
cp();
@@
-162,7
+162,7
@@
bool get_config_bool(config_t *cfg, bool *result)
return false;
}
return false;
}
-bool get_config_int(config_t *cfg, int *result)
+bool get_config_int(con
st con
fig_t *cfg, int *result)
{
cp();
{
cp();
@@
-178,7
+178,7
@@
bool get_config_int(config_t *cfg, int *result)
return false;
}
return false;
}
-bool get_config_string(config_t *cfg, char **result)
+bool get_config_string(con
st con
fig_t *cfg, char **result)
{
cp();
{
cp();
@@
-190,7
+190,7
@@
bool get_config_string(config_t *cfg, char **result)
return true;
}
return true;
}
-bool get_config_address(config_t *cfg, struct addrinfo **result)
+bool get_config_address(con
st con
fig_t *cfg, struct addrinfo **result)
{
struct addrinfo *ai;
{
struct addrinfo *ai;
@@
-212,7
+212,7
@@
bool get_config_address(config_t *cfg, struct addrinfo **result)
return false;
}
return false;
}
-bool get_config_subnet(config_t *cfg, subnet_t ** result)
+bool get_config_subnet(con
st con
fig_t *cfg, subnet_t ** result)
{
subnet_t *subnet;
{
subnet_t *subnet;