From 31afd2aaaeb76a12e232eab0fb6a550b73948737 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Mon, 22 Jun 2020 10:50:15 +0200 Subject: Make struct cfg global and make the corresponding changes throughout --- config.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index f49baad..eb980f8 100644 --- a/config.c +++ b/config.c @@ -315,14 +315,14 @@ error: /* Returns true if there's data left to parse in buf */ bool -config_parse_line(struct cfg *cfg, const char *filename, char **buf, +config_parse_line(const char *filename, char **buf, struct cfg_key_value_map *kvmap, int *rkey, const char **rkeyname, struct cfg_value *rvalue) { char *line, *tmp, *key; int i; - assert_return(cfg && buf && *buf && kvmap && rkey && rkeyname && rvalue, false); + assert_return(buf && *buf && kvmap && rkey && rkeyname && rvalue, false); eat_whitespace_and_comments(buf); line = get_line(buf); @@ -466,12 +466,11 @@ error: } bool -config_parse_header(struct cfg *cfg, const char *filename, const char *title, - char **buf) +config_parse_header(const char *filename, const char *title, char **buf) { char *line; - assert_return(cfg && !empty_str(filename) && !empty_str(title) && buf && *buf, false); + assert_return(!empty_str(filename) && !empty_str(title) && buf && *buf, false); eat_whitespace_and_comments(buf); -- cgit v1.2.3