diff --git a/echosrv-conf.c b/echosrv-conf.c index 738a883..98772a6 100644 --- a/echosrv-conf.c +++ b/echosrv-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Jun 22 21:28:44 2021. + * on Wed Jun 23 11:46:47 2021. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle @@ -126,6 +126,14 @@ typedef int config_t; return 0; \ } +enum { + CONFIG_TYPE_INT, + CONFIG_TYPE_BOOL, + CONFIG_TYPE_INT64, + CONFIG_TYPE_FLOAT, + CONFIG_TYPE_STRING +}; + make_config_setting_lookup(bool); make_config_setting_lookup(int); make_config_setting_lookup(int64); @@ -134,10 +142,14 @@ make_config_setting_lookup(string); make_config_setting_get(bool, int); make_config_setting_get(int, int); -make_config_setting_get(int64, int); +make_config_setting_get(int64, long long int); make_config_setting_get(float, double); make_config_setting_get(string, char*); +config_setting_t* config_root_setting(config_t* c) { + return NULL; +} + config_setting_t* config_lookup(config_t* c, const char* b) { return NULL; } @@ -146,10 +158,38 @@ void config_init(config_t* c) { return; } +char* config_setting_name(config_setting_t* c) { + return NULL; +} + +int config_setting_is_list(config_setting_t* c) { + return 0; +} + +int config_setting_is_array(config_setting_t* c) { + return 0; +} + +int config_setting_is_scalar(config_setting_t* c) { + return 0; +} + +int config_setting_index(const config_setting_t *setting) { + return 0; +} + config_setting_t* config_setting_lookup(config_setting_t* a, char* b) { return NULL; } +int config_setting_remove(config_setting_t* cfg, char* name) { + return 0; +} + +int config_setting_type(config_setting_t* s) { + return -1; +} + int config_setting_length(config_setting_t* a) { return 0; } @@ -1136,11 +1176,7 @@ int echocfg_cl_parse(int argc, char* argv[], struct echocfg_item* cfg) } } - s = config_lookup(&c, "/"); - if (!s) { - fprintf(stderr, "Lookup of root config failed\n"); - return -1; - } + s = config_root_setting(&c); res = read_block(s, cfg, table_echocfg, &errmsg); if (!res) { diff --git a/echosrv-conf.h b/echosrv-conf.h index efda497..4623181 100644 --- a/echosrv-conf.h +++ b/echosrv-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Jun 22 21:28:44 2021. + * on Wed Jun 23 11:46:47 2021. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle diff --git a/sslh-conf.c b/sslh-conf.c index 5f55656..530ef6b 100644 --- a/sslh-conf.c +++ b/sslh-conf.c @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Jun 22 21:28:43 2021. + * on Wed Jun 23 11:46:45 2021. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle @@ -126,6 +126,14 @@ typedef int config_t; return 0; \ } +enum { + CONFIG_TYPE_INT, + CONFIG_TYPE_BOOL, + CONFIG_TYPE_INT64, + CONFIG_TYPE_FLOAT, + CONFIG_TYPE_STRING +}; + make_config_setting_lookup(bool); make_config_setting_lookup(int); make_config_setting_lookup(int64); @@ -134,10 +142,14 @@ make_config_setting_lookup(string); make_config_setting_get(bool, int); make_config_setting_get(int, int); -make_config_setting_get(int64, int); +make_config_setting_get(int64, long long int); make_config_setting_get(float, double); make_config_setting_get(string, char*); +config_setting_t* config_root_setting(config_t* c) { + return NULL; +} + config_setting_t* config_lookup(config_t* c, const char* b) { return NULL; } @@ -146,10 +158,38 @@ void config_init(config_t* c) { return; } +char* config_setting_name(config_setting_t* c) { + return NULL; +} + +int config_setting_is_list(config_setting_t* c) { + return 0; +} + +int config_setting_is_array(config_setting_t* c) { + return 0; +} + +int config_setting_is_scalar(config_setting_t* c) { + return 0; +} + +int config_setting_index(const config_setting_t *setting) { + return 0; +} + config_setting_t* config_setting_lookup(config_setting_t* a, char* b) { return NULL; } +int config_setting_remove(config_setting_t* cfg, char* name) { + return 0; +} + +int config_setting_type(config_setting_t* s) { + return -1; +} + int config_setting_length(config_setting_t* a) { return 0; } @@ -1792,11 +1832,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg) } } - s = config_lookup(&c, "/"); - if (!s) { - fprintf(stderr, "Lookup of root config failed\n"); - return -1; - } + s = config_root_setting(&c); res = read_block(s, cfg, table_sslhcfg, &errmsg); if (!res) { diff --git a/sslh-conf.h b/sslh-conf.h index 434eae3..fbcc1c6 100644 --- a/sslh-conf.h +++ b/sslh-conf.h @@ -1,5 +1,5 @@ /* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) - * on Tue Jun 22 21:28:43 2021. + * on Wed Jun 23 11:46:45 2021. # conf2struct: generate libconf parsers that read to structs # Copyright (C) 2018-2019 Yves Rutschle