Fixed a typo, and replaced a `NULL` in the offset of

the null entry with -1 in `config_opts`.

1 files changed, 2 insertions, 2 deletions

diff --git a/config.h b/config.h
index b38a8ac..5a85baf 100644
--- a/config.h
+++ b/config.h
@@ -46,11 +46,11 @@ static const config_opt config_opts[] = {
 	{"git-root", "Root of git server (can also be a url).", TYPE_STRING, offsetof(config, git_root)},
 	{"socket-type", "Socket type to use (options: unix, network. default: network).", TYPE_STRING, offsetof(config, sock_type)},
 	{"socket", "Path, IP address, or domain name of socket.", TYPE_STRING, offsetof(config, sock)},
-	{"port", "Port to listen on (network socket only).", TYPE_INT, offsetof(config, sock_port)},
+	{"port", "Port to listen on (network socket only).", TYPE_INT, offsetof(config, port)},
 	{"merge-type", "Type of merge (options: 0 = Merge individually, 1 = Merge into one).", TYPE_INT, offsetof(config, merge_type)},
 	{"pr-root", "Directory to store pull requests in.", TYPE_STRING, offsetof(config, pr_root)},
 	{"key-file", "Path to file containing gpg/pgp public keys of each maintainer.", TYPE_STRING, offsetof(config, key_path)},
-	{NULL, NULL, TYPE_NONE, NULL},
+	{NULL, NULL, TYPE_NONE, -1},
 };
 
 extern config *parse_config(const char *filename);