fix for libconfig 1.7.3 (#292)

This commit is contained in:
yrutschle 2021-06-23 11:48:59 +02:00
parent bf2053eb79
commit 24e7f46a43
4 changed files with 88 additions and 16 deletions

View File

@ -1,5 +1,5 @@
/* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) /* 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 # conf2struct: generate libconf parsers that read to structs
# Copyright (C) 2018-2019 Yves Rutschle # Copyright (C) 2018-2019 Yves Rutschle
@ -126,6 +126,14 @@ typedef int config_t;
return 0; \ 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(bool);
make_config_setting_lookup(int); make_config_setting_lookup(int);
make_config_setting_lookup(int64); make_config_setting_lookup(int64);
@ -134,10 +142,14 @@ make_config_setting_lookup(string);
make_config_setting_get(bool, int); make_config_setting_get(bool, int);
make_config_setting_get(int, 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(float, double);
make_config_setting_get(string, char*); 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) { config_setting_t* config_lookup(config_t* c, const char* b) {
return NULL; return NULL;
} }
@ -146,10 +158,38 @@ void config_init(config_t* c) {
return; 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) { config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
return NULL; 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) { int config_setting_length(config_setting_t* a) {
return 0; return 0;
} }
@ -1136,11 +1176,7 @@ int echocfg_cl_parse(int argc, char* argv[], struct echocfg_item* cfg)
} }
} }
s = config_lookup(&c, "/"); s = config_root_setting(&c);
if (!s) {
fprintf(stderr, "Lookup of root config failed\n");
return -1;
}
res = read_block(s, cfg, table_echocfg, &errmsg); res = read_block(s, cfg, table_echocfg, &errmsg);
if (!res) { if (!res) {

View File

@ -1,5 +1,5 @@
/* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) /* 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 # conf2struct: generate libconf parsers that read to structs
# Copyright (C) 2018-2019 Yves Rutschle # Copyright (C) 2018-2019 Yves Rutschle

View File

@ -1,5 +1,5 @@
/* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) /* 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 # conf2struct: generate libconf parsers that read to structs
# Copyright (C) 2018-2019 Yves Rutschle # Copyright (C) 2018-2019 Yves Rutschle
@ -126,6 +126,14 @@ typedef int config_t;
return 0; \ 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(bool);
make_config_setting_lookup(int); make_config_setting_lookup(int);
make_config_setting_lookup(int64); make_config_setting_lookup(int64);
@ -134,10 +142,14 @@ make_config_setting_lookup(string);
make_config_setting_get(bool, int); make_config_setting_get(bool, int);
make_config_setting_get(int, 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(float, double);
make_config_setting_get(string, char*); 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) { config_setting_t* config_lookup(config_t* c, const char* b) {
return NULL; return NULL;
} }
@ -146,10 +158,38 @@ void config_init(config_t* c) {
return; 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) { config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
return NULL; 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) { int config_setting_length(config_setting_t* a) {
return 0; return 0;
} }
@ -1792,11 +1832,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
} }
} }
s = config_lookup(&c, "/"); s = config_root_setting(&c);
if (!s) {
fprintf(stderr, "Lookup of root config failed\n");
return -1;
}
res = read_block(s, cfg, table_sslhcfg, &errmsg); res = read_block(s, cfg, table_sslhcfg, &errmsg);
if (!res) { if (!res) {

View File

@ -1,5 +1,5 @@
/* Generated by conf2struct (https://www.rutschle.net/tech/conf2struct/README) /* 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 # conf2struct: generate libconf parsers that read to structs
# Copyright (C) 2018-2019 Yves Rutschle # Copyright (C) 2018-2019 Yves Rutschle