Rename var to func, and change all the variables to

function addresses.

This is to get rid of the need for global variables.

1 files changed, 8 insertions, 8 deletions

diff --git a/config.c b/config.c
index 7e25f34..8ce7ebc 100644
--- a/config.c
+++ b/config.c
@@ -4,14 +4,14 @@
 #include <string.h>
 
 static const config_opt config_opts[] = {
-	/* {"name", "desc", type, var} */
-	{"git-root", "Root of git server (can also be a url).", TYPE_STRING, git_root},
-	{"socket-type", "Socket type to use (options: unix, network. default: network).", TYPE_STRING, sock_type},
-	{"socket", "Path, IP address, or domain name of socket.", TYPE_STRING, sock},
-	{"port", "Port to listen on (network socket only).", TYPE_INT, &sock_port},
-	{"merge-type", "Type of merge (options: 0 = Merge individually, 1 = Merge into one).", TYPE_INT, &merge_type},
-	{"pr-root", "Directory to store pull requests in.", TYPE_STRING, pr_root},
-	{"key-file", "Path to file containing gpg/pgp public keys of each maintainer.", TYPE_STRING, key_path},
+	/* {"name", "desc", type, &func} */
+	{"git-root", "Root of git server (can also be a url).", TYPE_STRING, &get_git_root},
+	{"socket-type", "Socket type to use (options: unix, network. default: network).", TYPE_STRING, &get_sock_type},
+	{"socket", "Path, IP address, or domain name of socket.", TYPE_STRING, &get_sock},
+	{"port", "Port to listen on (network socket only).", TYPE_INT, &get_sock_port},
+	{"merge-type", "Type of merge (options: 0 = Merge individually, 1 = Merge into one).", TYPE_INT, &get_merge_type},
+	{"pr-root", "Directory to store pull requests in.", TYPE_STRING, &pr_root},
+	{"key-file", "Path to file containing gpg/pgp public keys of each maintainer.", TYPE_STRING, &get_key_path},
 };
 
 char *read_file(const char *filename, long *size) {