aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2018-10-20 20:48:27 +0200
committerTeddy Wing2018-10-20 20:48:27 +0200
commitdb8ad5e7c4c4dc027b242f00278daf661ad3ef22 (patch)
treea2e57a310c33d756608ebc5b92fbd8a495f03384
parent94bcede1b45abc251dad4c9872a4361c52ef3526 (diff)
downloadDomeKey-db8ad5e7c4c4dc027b242f00278daf661ad3ef22.tar.bz2
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`
-rw-r--r--DomeKey/main.m9
1 files changed, 8 insertions, 1 deletions
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];