From db8ad5e7c4c4dc027b242f00278daf661ad3ef22 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sat, 20 Oct 2018 20:48:27 +0200 Subject: Use new `c_parse_args()` method signature The function now takes a third `Config *` argument. Create a new config struct with `config_read_from_file()` and pass it to `c_parse_args()`. TODO: Rename `config_read_from_file` --- DomeKey/main.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/DomeKey/main.m b/DomeKey/main.m index f3c1eef..0f9d6ac 100644 --- a/DomeKey/main.m +++ b/DomeKey/main.m @@ -13,7 +13,14 @@ #import "dome_key_map.h" int main(int argc, const char * argv[]) { - Config *config = c_parse_args(argv, argc); + Config *config = config_read_from_file(); + + if (!config) { + NSLog(@"Unable to get config"); + return 1; + } + + config = c_parse_args(argv, argc, config); if (config->args.reload) { return [Mappings dispatchReload]; -- cgit v1.2.3