diff options
Diffstat (limited to 'src')
39 files changed, 2381 insertions, 1149 deletions
diff --git a/src/char/pincode.c b/src/char/pincode.c index af79d6f11..371442fac 100644 --- a/src/char/pincode.c +++ b/src/char/pincode.c @@ -32,6 +32,7 @@ #include "common/socket.h" #include "common/strlib.h" +#include <stdio.h> #include <stdlib.h> struct pincode_interface pincode_s; diff --git a/src/common/HPM.c b/src/common/HPM.c index d9c3262d7..f115c886e 100644 --- a/src/common/HPM.c +++ b/src/common/HPM.c @@ -616,8 +616,8 @@ CMDLINEARG(loadplugin) * Reads the plugin configuration and loads the plugins as necessary. */ void hplugins_config_read(void) { - config_t plugins_conf; - config_setting_t *plist = NULL; + struct config_t plugins_conf; + struct config_setting_t *plist = NULL; const char *config_filename = "conf/plugins.conf"; // FIXME hardcoded name FILE *fp; int i; @@ -628,12 +628,12 @@ void hplugins_config_read(void) { fclose(fp); } - if (libconfig->read_file(&plugins_conf, config_filename)) + if (!libconfig->load_file(&plugins_conf, config_filename)) return; plist = libconfig->lookup(&plugins_conf, "plugins_list"); for (i = 0; i < VECTOR_LENGTH(HPM->cmdline_load_plugins); i++) { - config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING); + struct config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING); config_setting_set_string(entry, VECTOR_INDEX(HPM->cmdline_load_plugins, i)); } diff --git a/src/common/conf.c b/src/common/conf.c index 3e8c08963..25f1013f5 100644 --- a/src/common/conf.c +++ b/src/common/conf.c @@ -23,6 +23,7 @@ #include "conf.h" #include "common/showmsg.h" // ShowError +#include "common/strlib.h" // safestrncpy #include <libconfig/libconfig.h> @@ -30,26 +31,39 @@ struct libconfig_interface libconfig_s; struct libconfig_interface *libconfig; -int conf_read_file(config_t *config, const char *config_filename) { +/** + * Initializes 'config' and loads a configuration file. + * + * Shows error and destroys 'config' in case of failure. + * It is the caller's care to destroy 'config' in case of success. + * + * @param config The config file to initialize. + * @param config_filename The file to read. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_load_file(struct config_t *config, const char *config_filename) +{ libconfig->init(config); - if (!libconfig->read_file_src(config, config_filename)) { + if (libconfig->read_file_src(config, config_filename) != CONFIG_TRUE) { ShowError("%s:%d - %s\n", config_error_file(config), config_error_line(config), config_error_text(config)); libconfig->destroy(config); - return 1; + return CONFIG_FALSE; } - return 0; + return CONFIG_TRUE; } // // Functions to copy settings from libconfig/contrib // -void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) { +void config_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) +{ if (config_setting_is_aggregate(src)) { libconfig->setting_copy_aggregate(parent, src); - } - else { - config_setting_t *set; + } else { + struct config_setting_t *set; if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL ) return; @@ -73,8 +87,9 @@ void config_setting_copy_simple(config_setting_t *parent, const config_setting_t } } -void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) { - config_setting_t *set = NULL; +void config_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) +{ + struct config_setting_t *set = NULL; if (config_setting_is_aggregate(src)) libconfig->setting_copy_aggregate(parent, src); @@ -93,8 +108,9 @@ void config_setting_copy_elem(config_setting_t *parent, const config_setting_t * } } -void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) { - config_setting_t *newAgg; +void config_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) +{ + struct config_setting_t *newAgg; int i, n; if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL ) @@ -116,7 +132,8 @@ void config_setting_copy_aggregate(config_setting_t *parent, const config_settin } } -int config_setting_copy(config_setting_t *parent, const config_setting_t *src) { +int config_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) +{ if (!config_setting_is_group(parent) && !config_setting_is_list(parent)) return CONFIG_FALSE; @@ -128,14 +145,237 @@ int config_setting_copy(config_setting_t *parent, const config_setting_t *src) { return CONFIG_TRUE; } +/** + * Converts the value of a setting that is type CONFIG_TYPE_BOOL to bool. + * + * @param setting The setting to read. + * + * @return The converted value. + * @retval false in case of failure. + */ +bool config_setting_get_bool_real(const struct config_setting_t *setting) +{ + if (setting == NULL || setting->type != CONFIG_TYPE_BOOL) + return false; + + return setting->value.ival ? true : false; +} + +/** + * Same as config_setting_lookup_bool, but uses bool instead of int. + * + * @param[in] setting The setting to read. + * @param[in] name The setting name to lookup. + * @param[out] value The output value. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) +{ + struct config_setting_t *member = config_setting_get_member(setting, name); + + if (!member) + return CONFIG_FALSE; + + if (config_setting_type(member) != CONFIG_TYPE_BOOL) + return CONFIG_FALSE; + + *value = config_setting_get_bool_real(member); + + return CONFIG_TRUE; +} + +/** + * Converts and returns a configuration that is CONFIG_TYPE_INT to unsigned int (uint32). + * + * @param setting The setting to read. + * + * @return The converted value. + * @retval 0 in case of failure. + */ +uint32 config_setting_get_uint32(const struct config_setting_t *setting) +{ + if (setting == NULL || setting->type != CONFIG_TYPE_INT) + return 0; + + if (setting->value.ival < 0) + return 0; + + return (uint32)setting->value.ival; +} + +/** + * Looks up a configuration entry of type CONFIG_TYPE_INT and reads it as uint32. + * + * @param[in] setting The setting to read. + * @param[in] name The setting name to lookup. + * @param[out] value The output value. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) +{ + struct config_setting_t *member = config_setting_get_member(setting, name); + + if (!member) + return CONFIG_FALSE; + + if (config_setting_type(member) != CONFIG_TYPE_INT) + return CONFIG_FALSE; + + *value = config_setting_get_uint32(member); + + return CONFIG_TRUE; +} + +/** + * Converts and returns a configuration that is CONFIG_TYPE_INT to uint16 + * + * @param setting The setting to read. + * + * @return The converted value. + * @retval 0 in case of failure. + */ +uint16 config_setting_get_uint16(const struct config_setting_t *setting) +{ + if (setting == NULL || setting->type != CONFIG_TYPE_INT) + return 0; + + if (setting->value.ival > UINT16_MAX) + return UINT16_MAX; + if (setting->value.ival < UINT16_MIN) + return UINT16_MIN; + + return (uint16)setting->value.ival; +} + +/** + * Looks up a configuration entry of type CONFIG_TYPE_INT and reads it as uint16. + * + * @param[in] setting The setting to read. + * @param[in] name The setting name to lookup. + * @param[out] value The output value. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) +{ + struct config_setting_t *member = config_setting_get_member(setting, name); + + if (!member) + return CONFIG_FALSE; + + if (config_setting_type(member) != CONFIG_TYPE_INT) + return CONFIG_FALSE; + + *value = config_setting_get_uint16(member); + + return CONFIG_TRUE; +} + +/** + * Converts and returns a configuration that is CONFIG_TYPE_INT to int16 + * + * @param setting The setting to read. + * + * @return The converted value. + * @retval 0 in case of failure. + */ +int16 config_setting_get_int16(const struct config_setting_t *setting) +{ + if (setting == NULL || setting->type != CONFIG_TYPE_INT) + return 0; + + if (setting->value.ival > INT16_MAX) + return INT16_MAX; + if (setting->value.ival < INT16_MIN) + return INT16_MIN; + + return (int16)setting->value.ival; +} + +/** + * Looks up a configuration entry of type CONFIG_TYPE_INT and reads it as int16. + * + * @param[in] setting The setting to read. + * @param[in] name The setting name to lookup. + * @param[out] value The output value. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) +{ + struct config_setting_t *member = config_setting_get_member(setting, name); + + if (!member) + return CONFIG_FALSE; + + if (config_setting_type(member) != CONFIG_TYPE_INT) + return CONFIG_FALSE; + + *value = config_setting_get_int16(member); + + return CONFIG_TRUE; +} + +/** + * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a struct config_setting_t and copies it into a (non-const) char buffer. + * + * @param[in] setting The setting to read. + * @param[in] name The setting name to lookup. + * @param[out] out The output buffer. + * @param[in] out_size The size of the output buffer. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) +{ + const char *str = NULL; + + if (libconfig->setting_lookup_string(setting, name, &str) == CONFIG_TRUE) { + safestrncpy(out, str, out_size); + return CONFIG_TRUE; + } + + return CONFIG_FALSE; +} + +/** + * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a struct config_t and copies it into a (non-const) char buffer. + * + * @param[in] config The configuration to read. + * @param[in] name The setting name to lookup. + * @param[out] out The output buffer. + * @param[in] out_size The size of the output buffer. + * + * @retval CONFIG_TRUE in case of success. + * @retval CONFIG_FALSE in case of failure. + */ +int config_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) +{ + const char *str = NULL; + + if (libconfig->lookup_string(config, name, &str) == CONFIG_TRUE) { + safestrncpy(out, str, out_size); + return CONFIG_TRUE; + } + + return CONFIG_FALSE; +} + void libconfig_defaults(void) { libconfig = &libconfig_s; libconfig->read = config_read; libconfig->write = config_write; /* */ - libconfig->set_auto_convert = config_set_auto_convert; - libconfig->get_auto_convert = config_get_auto_convert; + libconfig->set_options = config_set_options; + libconfig->get_options = config_get_options; /* */ libconfig->read_string = config_read_string; libconfig->read_file_src = config_read_file; @@ -153,6 +393,7 @@ void libconfig_defaults(void) { libconfig->setting_get_bool = config_setting_get_bool; libconfig->setting_get_string = config_setting_get_string; /* */ + libconfig->setting_lookup = config_setting_lookup; libconfig->setting_lookup_int = config_setting_lookup_int; libconfig->setting_lookup_int64 = config_setting_lookup_int64; libconfig->setting_lookup_float = config_setting_lookup_float; @@ -193,7 +434,6 @@ void libconfig_defaults(void) { libconfig->setting_set_hook = config_setting_set_hook; /* */ libconfig->lookup = config_lookup; - libconfig->lookup_from = config_lookup_from; /* */ libconfig->lookup_int = config_lookup_int; libconfig->lookup_int64 = config_lookup_int64; @@ -201,9 +441,23 @@ void libconfig_defaults(void) { libconfig->lookup_bool = config_lookup_bool; libconfig->lookup_string = config_lookup_string; /* those are custom and are from src/common/conf.c */ - libconfig->read_file = conf_read_file; + libconfig->load_file = config_load_file; libconfig->setting_copy_simple = config_setting_copy_simple; libconfig->setting_copy_elem = config_setting_copy_elem; libconfig->setting_copy_aggregate = config_setting_copy_aggregate; libconfig->setting_copy = config_setting_copy; + + /* Functions to get different types */ + libconfig->setting_get_bool_real = config_setting_get_bool_real; + libconfig->setting_get_uint32 = config_setting_get_uint32; + libconfig->setting_get_uint16 = config_setting_get_uint16; + libconfig->setting_get_int16 = config_setting_get_int16; + + /* Functions to lookup different types */ + libconfig->setting_lookup_int16 = config_setting_lookup_int16; + libconfig->setting_lookup_bool_real = config_setting_lookup_bool_real; + libconfig->setting_lookup_uint32 = config_setting_lookup_uint32; + libconfig->setting_lookup_uint16 = config_setting_lookup_uint16; + libconfig->setting_lookup_mutable_string = config_setting_lookup_mutable_string; + libconfig->lookup_mutable_string = config_lookup_mutable_string; } diff --git a/src/common/conf.h b/src/common/conf.h index 19b13c51a..f2bfcac62 100644 --- a/src/common/conf.h +++ b/src/common/conf.h @@ -29,82 +29,94 @@ * The libconfig interface -- specially for plugins, but we enforce it throughout the core to be consistent **/ struct libconfig_interface { - int (*read) (config_t *config, FILE *stream); - void (*write) (const config_t *config, FILE *stream); + int (*read) (struct config_t *config, FILE *stream); + void (*write) (const struct config_t *config, FILE *stream); /* */ - void (*set_auto_convert) (config_t *config, int flag); // TODO: Replace with config_set_options - int (*get_auto_convert) (const config_t *config); // TODO: Replace with config_get_options + void (*set_options) (struct config_t *config, int options); + int (*get_options) (const struct config_t *config); /* */ - int (*read_string) (config_t *config, const char *str); - int (*read_file_src) (config_t *config, const char *filename); - int (*write_file) (config_t *config, const char *filename); - - void (*set_destructor) (config_t *config, void (*destructor)(void *)); - void (*set_include_dir) (config_t *config, const char *include_dir); - - void (*init) (config_t *config); - void (*destroy) (config_t *config); - - int (*setting_get_int) (const config_setting_t *setting); - long long (*setting_get_int64) (const config_setting_t *setting); - double (*setting_get_float) (const config_setting_t *setting); - - int (*setting_get_bool) (const config_setting_t *setting); - - const char * (*setting_get_string) (const config_setting_t *setting); - - int (*setting_lookup_int) (const config_setting_t *setting, const char *name, int *value); - int (*setting_lookup_int64) (const config_setting_t *setting, const char *name, long long *value); - int (*setting_lookup_float) (const config_setting_t *setting, const char *name, double *value); - int (*setting_lookup_bool) (const config_setting_t *setting, const char *name, int *value); - int (*setting_lookup_string) (const config_setting_t *setting, const char *name, const char **value); - int (*setting_set_int) (config_setting_t *setting ,int value); - int (*setting_set_int64) (config_setting_t *setting, long long value); - int (*setting_set_float) (config_setting_t *setting, double value); - int (*setting_set_bool) (config_setting_t *setting, int value); - int (*setting_set_string) (config_setting_t *setting, const char *value); - - int (*setting_set_format) (config_setting_t *setting, short format); - short (*setting_get_format) (const config_setting_t *setting); - - int (*setting_get_int_elem) (const config_setting_t *setting, int idx); - long long (*setting_get_int64_elem) (const config_setting_t *setting, int idx); - double (*setting_get_float_elem) (const config_setting_t *setting, int idx); - int (*setting_get_bool_elem) (const config_setting_t *setting, int idx); - const char * (*setting_get_string_elem) (const config_setting_t *setting, int idx); - config_setting_t * (*setting_set_int_elem) (config_setting_t *setting, int idx, int value); - config_setting_t * (*setting_set_int64_elem) (config_setting_t *setting, int idx, long long value); - config_setting_t * (*setting_set_float_elem) (config_setting_t *setting, int idx, double value); - config_setting_t * (*setting_set_bool_elem) (config_setting_t *setting, int idx, int value); - config_setting_t * (*setting_set_string_elem) (config_setting_t *setting, int idx, const char *value); - - int (*setting_index) (const config_setting_t *setting); - int (*setting_length) (const config_setting_t *setting); - - config_setting_t * (*setting_get_elem) (const config_setting_t *setting, unsigned int idx); - config_setting_t * (*setting_get_member) (const config_setting_t *setting, const char *name); - - config_setting_t * (*setting_add) (config_setting_t *parent, const char *name, int type); - int (*setting_remove) (config_setting_t *parent, const char *name); - - int (*setting_remove_elem) (config_setting_t *parent, unsigned int idx); - void (*setting_set_hook) (config_setting_t *setting, void *hook); - - config_setting_t * (*lookup) (const config_t *config, const char *filepath); - config_setting_t * (*lookup_from) (config_setting_t *setting, const char *filepath); - int (*lookup_int) (const config_t *config, const char *filepath, int *value); - int (*lookup_int64) (const config_t *config, const char *filepath, long long *value); - int (*lookup_float) (const config_t *config, const char *filepath, double *value); - int (*lookup_bool) (const config_t *config, const char *filepath, int *value); - int (*lookup_string) (const config_t *config, const char *filepath, const char **value); + int (*read_string) (struct config_t *config, const char *str); + int (*read_file_src) (struct config_t *config, const char *filename); + int (*write_file) (struct config_t *config, const char *filename); + + void (*set_destructor) (struct config_t *config, void (*destructor)(void *)); + void (*set_include_dir) (struct config_t *config, const char *include_dir); + + void (*init) (struct config_t *config); + void (*destroy) (struct config_t *config); + + int (*setting_get_int) (const struct config_setting_t *setting); + long long (*setting_get_int64) (const struct config_setting_t *setting); + double (*setting_get_float) (const struct config_setting_t *setting); + + int (*setting_get_bool) (const struct config_setting_t *setting); + + const char * (*setting_get_string) (const struct config_setting_t *setting); + + struct config_setting_t * (*setting_lookup) (struct config_setting_t *setting, const char *name); + int (*setting_lookup_int) (const struct config_setting_t *setting, const char *name, int *value); + int (*setting_lookup_int64) (const struct config_setting_t *setting, const char *name, long long *value); + int (*setting_lookup_float) (const struct config_setting_t *setting, const char *name, double *value); + int (*setting_lookup_bool) (const struct config_setting_t *setting, const char *name, int *value); + int (*setting_lookup_string) (const struct config_setting_t *setting, const char *name, const char **value); + int (*setting_set_int) (struct config_setting_t *setting ,int value); + int (*setting_set_int64) (struct config_setting_t *setting, long long value); + int (*setting_set_float) (struct config_setting_t *setting, double value); + int (*setting_set_bool) (struct config_setting_t *setting, int value); + int (*setting_set_string) (struct config_setting_t *setting, const char *value); + + int (*setting_set_format) (struct config_setting_t *setting, short format); + short (*setting_get_format) (const struct config_setting_t *setting); + + int (*setting_get_int_elem) (const struct config_setting_t *setting, int idx); + long long (*setting_get_int64_elem) (const struct config_setting_t *setting, int idx); + double (*setting_get_float_elem) (const struct config_setting_t *setting, int idx); + int (*setting_get_bool_elem) (const struct config_setting_t *setting, int idx); + const char * (*setting_get_string_elem) (const struct config_setting_t *setting, int idx); + struct config_setting_t * (*setting_set_int_elem) (struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*setting_set_int64_elem) (struct config_setting_t *setting, int idx, long long value); + struct config_setting_t * (*setting_set_float_elem) (struct config_setting_t *setting, int idx, double value); + struct config_setting_t * (*setting_set_bool_elem) (struct config_setting_t *setting, int idx, int value); + struct config_setting_t * (*setting_set_string_elem) (struct config_setting_t *setting, int idx, const char *value); + + int (*setting_index) (const struct config_setting_t *setting); + int (*setting_length) (const struct config_setting_t *setting); + + struct config_setting_t * (*setting_get_elem) (const struct config_setting_t *setting, unsigned int idx); + struct config_setting_t * (*setting_get_member) (const struct config_setting_t *setting, const char *name); + + struct config_setting_t * (*setting_add) (struct config_setting_t *parent, const char *name, int type); + int (*setting_remove) (struct config_setting_t *parent, const char *name); + + int (*setting_remove_elem) (struct config_setting_t *parent, unsigned int idx); + void (*setting_set_hook) (struct config_setting_t *setting, void *hook); + + struct config_setting_t * (*lookup) (const struct config_t *config, const char *filepath); + int (*lookup_int) (const struct config_t *config, const char *filepath, int *value); + int (*lookup_int64) (const struct config_t *config, const char *filepath, long long *value); + int (*lookup_float) (const struct config_t *config, const char *filepath, double *value); + int (*lookup_bool) (const struct config_t *config, const char *filepath, int *value); + int (*lookup_string) (const struct config_t *config, const char *filepath, const char **value); /* those are custom and are from src/common/conf.c */ /* Functions to copy settings from libconfig/contrib */ - int (*read_file) (config_t *config, const char *config_filename); - void (*setting_copy_simple) (config_setting_t *parent, const config_setting_t *src); - void (*setting_copy_elem) (config_setting_t *parent, const config_setting_t *src); - void (*setting_copy_aggregate) (config_setting_t *parent, const config_setting_t *src); - int (*setting_copy) (config_setting_t *parent, const config_setting_t *src); + int (*load_file) (struct config_t *config, const char *config_filename); + void (*setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src); + void (*setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src); + int (*setting_copy) (struct config_setting_t *parent, const struct config_setting_t *src); + /* Functions to get other types */ + bool (*setting_get_bool_real) (const struct config_setting_t *setting); + uint32 (*setting_get_uint32) (const struct config_setting_t *setting); + uint16 (*setting_get_uint16) (const struct config_setting_t *setting); + int16 (*setting_get_int16) (const struct config_setting_t *setting); + + int (*setting_lookup_bool_real) (const struct config_setting_t *setting, const char *name, bool *value); + int (*setting_lookup_uint32) (const struct config_setting_t *setting, const char *name, uint32 *value); + int (*setting_lookup_uint16) (const struct config_setting_t *setting, const char *name, uint16 *value); + int (*setting_lookup_int16) (const struct config_setting_t *setting, const char *name, int16 *value); + int (*setting_lookup_mutable_string) (const struct config_setting_t *setting, const char *name, char *out, size_t out_size); + int (*lookup_mutable_string) (const struct config_t *config, const char *name, char *out, size_t out_size); }; #ifdef HERCULES_CORE diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 956222a7d..4d4c72b42 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -23,11 +23,10 @@ #include "showmsg.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/core.h" //[Ind] - For SERVER_TYPE #include "common/strlib.h" // StringBuf -#include <libconfig/libconfig.h> - #include <stdarg.h> #include <stdio.h> #include <stdlib.h> // atexit @@ -799,8 +798,8 @@ void showmsg_showWarning(const char *string, ...) vShowMessage_(MSG_WARNING, string, ap); va_end(ap); } -void showmsg_showConfigWarning(config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3))); -void showmsg_showConfigWarning(config_setting_t *config, const char *string, ...) +void showmsg_showConfigWarning(struct config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3))); +void showmsg_showConfigWarning(struct config_setting_t *config, const char *string, ...) { StringBuf buf; va_list ap; diff --git a/src/common/showmsg.h b/src/common/showmsg.h index ed8776fb0..7b48d0df2 100644 --- a/src/common/showmsg.h +++ b/src/common/showmsg.h @@ -23,10 +23,11 @@ #include "common/hercules.h" -#include <libconfig/libconfig.h> - #include <stdarg.h> +/* Forward Declarations */ +struct config_setting_t; + // for help with the console colors look here: // http://www.edoceo.com/liberum/?doc=printf-with-color // some code explanation (used here): @@ -118,7 +119,7 @@ struct showmsg_interface { void (*showDebug) (const char *, ...) __attribute__((format(printf, 1, 2))); void (*showError) (const char *, ...) __attribute__((format(printf, 1, 2))); void (*showFatalError) (const char *, ...) __attribute__((format(printf, 1, 2))); - void (*showConfigWarning) (config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3))); + void (*showConfigWarning) (struct config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3))); }; /* the purpose of these macros is simply to not make calling them be an annoyance */ diff --git a/src/common/socket.c b/src/common/socket.c index 740c07bdc..8b1ab3959 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -25,6 +25,7 @@ #include "common/HPM.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/db.h" #include "common/memmgr.h" #include "common/mmo.h" @@ -1686,7 +1687,7 @@ bool socket_trusted_ip_check(uint32 ip) * @param[in] groupname Current group name, for output/logging reasons. * @return The amount of entries read, zero in case of errors. */ -int socket_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) +int socket_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { int i, len; char ipbuf[64], maskbuf[64]; @@ -1722,11 +1723,11 @@ int socket_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list */ void socket_net_config_read(const char *filename) { - config_t network_config; + struct config_t network_config; int i; nullpo_retv(filename); - if (libconfig->read_file(&network_config, filename)) { + if (!libconfig->load_file(&network_config, filename)) { ShowError("LAN Support configuration file is not found: '%s'. This server won't be able to accept connections from any servers.\n", filename); return; } diff --git a/src/common/socket.h b/src/common/socket.h index e99278052..70fbc3492 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -22,7 +22,6 @@ #define COMMON_SOCKET_H #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #ifdef WIN32 @@ -34,7 +33,9 @@ # include <sys/types.h> #endif +/* Forward Declarations */ struct hplugin_data_store; +struct config_setting_t; #define FIFOSIZE_SERVERLINK 256*1024 @@ -214,7 +215,7 @@ struct socket_interface { uint32 (*lan_subnet_check) (uint32 ip, struct s_subnet *info); bool (*allowed_ip_check) (uint32 ip); bool (*trusted_ip_check) (uint32 ip); - int (*net_config_read_sub) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*net_config_read_sub) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); void (*net_config_read) (const char *filename); }; diff --git a/src/common/sql.c b/src/common/sql.c index f6280c436..b1e77e636 100644 --- a/src/common/sql.c +++ b/src/common/sql.c @@ -32,6 +32,7 @@ # include "common/winapi.h" // Needed before mysql.h #endif #include <mysql.h> +#include <stdio.h> #include <stdlib.h> // strtoul void hercules_mysql_error_handler(unsigned int ecode); diff --git a/src/login/login.c b/src/login/login.c index d4768df86..71cdded02 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -28,7 +28,6 @@ #include "login/loginlog.h" #include "common/HPM.h" #include "common/cbasetypes.h" -#include "common/conf.h" #include "common/core.h" #include "common/db.h" #include "common/memmgr.h" diff --git a/src/map/atcommand.c b/src/map/atcommand.c index bc539837d..eb48adc1d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3613,16 +3613,16 @@ ACMD(reloadskilldb) * @reloadatcommand - reloads conf/atcommand.conf conf/groups.conf *------------------------------------------*/ ACMD(reloadatcommand) { - config_t run_test; + struct config_t run_test; - if (libconfig->read_file(&run_test, "conf/groups.conf")) { + if (!libconfig->load_file(&run_test, "conf/groups.conf")) { clif->message(fd, msg_fd(fd,1036)); // Error reading groups.conf, reload failed. return false; } libconfig->destroy(&run_test); - if (libconfig->read_file(&run_test, map->ATCOMMAND_CONF_FILENAME)) { + if (!libconfig->load_file(&run_test, map->ATCOMMAND_CONF_FILENAME)) { clif->message(fd, msg_fd(fd,1037)); // Error reading atcommand.conf, reload failed. return false; } @@ -10006,13 +10006,13 @@ bool atcommand_exec(const int fd, struct map_session_data *sd, const char *messa * *------------------------------------------*/ void atcommand_config_read(const char* config_filename) { - config_t atcommand_config; - config_setting_t *aliases = NULL, *help = NULL, *nolog = NULL; + struct config_t atcommand_config; + struct config_setting_t *aliases = NULL, *help = NULL, *nolog = NULL; const char *symbol = NULL; int num_aliases = 0; nullpo_retv(config_filename); - if (libconfig->read_file(&atcommand_config, config_filename)) + if (!libconfig->load_file(&atcommand_config, config_filename)) return; // Command symbols @@ -10041,7 +10041,7 @@ void atcommand_config_read(const char* config_filename) { int count = libconfig->setting_length(aliases); for (i = 0; i < count; ++i) { - config_setting_t *command; + struct config_setting_t *command; const char *commandname = NULL; int j = 0, alias_count = 0; AtCommandInfo *commandinfo = NULL; @@ -10079,7 +10079,7 @@ void atcommand_config_read(const char* config_filename) { int count = libconfig->setting_length(nolog); for (i = 0; i < count; ++i) { - config_setting_t *command; + struct config_setting_t *command; const char *commandname = NULL; AtCommandInfo *commandinfo = NULL; @@ -10101,7 +10101,7 @@ void atcommand_config_read(const char* config_filename) { int i; for (i = 0; i < count; ++i) { - config_setting_t *command; + struct config_setting_t *command; const char *commandname; AtCommandInfo *commandinfo = NULL; @@ -10144,7 +10144,7 @@ static inline int atcommand_command_type2idx(AtCommandType type) * Loads permissions for groups to use commands. * */ -void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz) +void atcommand_db_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz) { DBIterator *iter = db_iterator(atcommand->db); AtCommandInfo *atcmd; @@ -10157,7 +10157,7 @@ void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **command CREATE(atcmd->char_groups, char, sz); for (i = 0; i < sz; i++) { GroupSettings *group = groups[i]; - config_setting_t *commands = commands_[i]; + struct config_setting_t *commands = commands_[i]; int result = 0; int idx = -1; @@ -10178,7 +10178,7 @@ void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **command } if (commands != NULL) { - config_setting_t *cmd = NULL; + struct config_setting_t *cmd = NULL; // <commandname> : <bool> (only atcommand) if (config_setting_lookup_bool(commands, atcmd->command, &result) && result) { diff --git a/src/map/atcommand.h b/src/map/atcommand.h index 5c4acdf01..a4f9afce7 100644 --- a/src/map/atcommand.h +++ b/src/map/atcommand.h @@ -23,7 +23,6 @@ #include "map/pc_groups.h" #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #include <stdarg.h> @@ -34,6 +33,7 @@ struct map_session_data; struct AtCommandInfo; struct block_list; +struct config_setting_t; /** * Defines @@ -110,7 +110,7 @@ struct atcommand_interface { bool (*create) (char *name, AtCommandFunc func); bool (*can_use) (struct map_session_data *sd, const char *command); bool (*can_use2) (struct map_session_data *sd, const char *command, AtCommandType type); - void (*load_groups) (GroupSettings **groups, config_setting_t **commands_, size_t sz); + void (*load_groups) (GroupSettings **groups, struct config_setting_t **commands_, size_t sz); AtCommandInfo* (*exists) (const char* name); bool (*msg_read) (const char *cfg_name, bool allow_override); void (*final_msg) (void); diff --git a/src/map/battleground.c b/src/map/battleground.c index e3fedbf34..d25aef851 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -330,18 +330,18 @@ enum bg_queue_types bg_str2teamtype (const char *str) { } void bg_config_read(void) { - config_t bg_conf; - config_setting_t *data = NULL; + struct config_t bg_conf; + struct config_setting_t *data = NULL; const char *config_filename = "conf/battlegrounds.conf"; // FIXME hardcoded name - if (libconfig->read_file(&bg_conf, config_filename)) + if (!libconfig->load_file(&bg_conf, config_filename)) return; data = libconfig->lookup(&bg_conf, "battlegrounds"); if (data != NULL) { - config_setting_t *settings = libconfig->setting_get_elem(data, 0); - config_setting_t *arenas; + struct config_setting_t *settings = libconfig->setting_get_elem(data, 0); + struct config_setting_t *arenas; const char *delay_var; int offline = 0; @@ -361,8 +361,8 @@ void bg_config_read(void) { int arena_count = libconfig->setting_length(arenas); CREATE( bg->arena, struct bg_arena *, arena_count ); for(i = 0; i < arena_count; i++) { - config_setting_t *arena = libconfig->setting_get_elem(arenas, i); - config_setting_t *reward; + struct config_setting_t *arena = libconfig->setting_get_elem(arenas, i); + struct config_setting_t *reward; const char *aName, *aEvent, *aDelayVar, *aTeamTypes; int minLevel = 0, maxLevel = 0; int prizeWin, prizeLoss, prizeDraw; diff --git a/src/map/channel.c b/src/map/channel.c index d778b355d..45b59898c 100644 --- a/src/map/channel.c +++ b/src/map/channel.c @@ -589,19 +589,19 @@ void channel_quit_guild(struct map_session_data *sd) void read_channels_config(void) { - config_t channels_conf; - config_setting_t *chsys = NULL; + struct config_t channels_conf; + struct config_setting_t *chsys = NULL; const char *config_filename = "conf/channels.conf"; // FIXME hardcoded name - if (libconfig->read_file(&channels_conf, config_filename)) + if (!libconfig->load_file(&channels_conf, config_filename)) return; chsys = libconfig->lookup(&channels_conf, "chsys"); if (chsys != NULL) { - config_setting_t *settings = libconfig->setting_get_elem(chsys, 0); - config_setting_t *channels; - config_setting_t *colors; + struct config_setting_t *settings = libconfig->setting_get_elem(chsys, 0); + struct config_setting_t *channels; + struct config_setting_t *colors; int i,k; const char *local_name, *ally_name, *local_color, *ally_color, @@ -710,7 +710,7 @@ void read_channels_config(void) CREATE(channel->config->colors, unsigned int, color_count); CREATE(channel->config->colors_name, char *, color_count); for(i = 0; i < color_count; i++) { - config_setting_t *color = libconfig->setting_get_elem(colors, i); + struct config_setting_t *color = libconfig->setting_get_elem(colors, i); CREATE(channel->config->colors_name[i], char, HCS_NAME_LENGTH); @@ -771,7 +771,7 @@ void read_channels_config(void) int channel_count = libconfig->setting_length(channels); for(i = 0; i < channel_count; i++) { - config_setting_t *chan = libconfig->setting_get_elem(channels, i); + struct config_setting_t *chan = libconfig->setting_get_elem(channels, i); const char *name = config_setting_name(chan); const char *color = libconfig->setting_get_string_elem(channels,i); diff --git a/src/map/clif.c b/src/map/clif.c index 3b2f255ef..66a8e92b8 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -17308,8 +17308,8 @@ void clif_parse_MoveItem(int fd, struct map_session_data *sd) { /* [Ind/Hercules] */ void clif_cashshop_db(void) { - config_t cashshop_conf; - config_setting_t *cashshop = NULL, *cats = NULL; + struct config_t cashshop_conf; + struct config_setting_t *cashshop = NULL, *cats = NULL; const char *config_filename = "db/cashshop_db.conf"; // FIXME hardcoded name int i, item_count_t = 0; for( i = 0; i < CASHSHOP_TAB_MAX; i++ ) { @@ -17317,16 +17317,14 @@ void clif_cashshop_db(void) { clif->cs.item_count[i] = 0; } - if (libconfig->read_file(&cashshop_conf, config_filename)) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&cashshop_conf, config_filename)) return; - } cashshop = libconfig->lookup(&cashshop_conf, "cash_shop"); if( cashshop != NULL && (cats = libconfig->setting_get_elem(cashshop, 0)) != NULL ) { for(i = 0; i < CASHSHOP_TAB_MAX; i++) { - config_setting_t *cat; + struct config_setting_t *cat; char entry_name[10]; sprintf(entry_name,"cat_%d",i); @@ -17335,7 +17333,7 @@ void clif_cashshop_db(void) { int k, item_count = libconfig->setting_length(cat); for(k = 0; k < item_count; k++) { - config_setting_t *entry = libconfig->setting_get_elem(cat,k); + struct config_setting_t *entry = libconfig->setting_get_elem(cat,k); const char *name = config_setting_name(entry); int price = libconfig->setting_get_int(entry); struct item_data * data = NULL; @@ -18368,8 +18366,8 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) { } bool clif_parse_roulette_db(void) { - config_t roulette_conf; - config_setting_t *roulette = NULL, *levels = NULL; + struct config_t roulette_conf; + struct config_setting_t *roulette = NULL, *levels = NULL; const char *config_filename = "db/roulette_db.conf"; // FIXME hardcoded name int i, j, item_count_t = 0; @@ -18377,15 +18375,13 @@ bool clif_parse_roulette_db(void) { clif->rd.items[i] = 0; } - if (libconfig->read_file(&roulette_conf, config_filename)) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&roulette_conf, config_filename)) return false; - } roulette = libconfig->lookup(&roulette_conf, "roulette"); if( roulette != NULL && (levels = libconfig->setting_get_elem(roulette, 0)) != NULL ) { for(i = 0; i < MAX_ROULETTE_LEVEL; i++) { - config_setting_t *level; + struct config_setting_t *level; char entry_name[10]; sprintf(entry_name,"level_%d",i+1); @@ -18394,7 +18390,7 @@ bool clif_parse_roulette_db(void) { int k, item_count = libconfig->setting_length(level); for(k = 0; k < item_count; k++) { - config_setting_t *entry = libconfig->setting_get_elem(level,k); + struct config_setting_t *entry = libconfig->setting_get_elem(level,k); const char *name = config_setting_name(entry); int qty = libconfig->setting_get_int(entry); struct item_data * data = NULL; diff --git a/src/map/itemdb.c b/src/map/itemdb.c index bd552dd16..da72ab05a 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -637,8 +637,8 @@ int itemdb_isidentified2(struct item_data *data) { } void itemdb_read_groups(void) { - config_t item_group_conf; - config_setting_t *itg = NULL, *it = NULL; + struct config_t item_group_conf; + struct config_setting_t *itg = NULL, *it = NULL; #ifdef RENEWAL const char *config_filename = "db/re/item_group.conf"; // FIXME hardcoded name #else @@ -648,10 +648,8 @@ void itemdb_read_groups(void) { int i = 0, count = 0, c; unsigned int *gsize = NULL; - if (libconfig->read_file(&item_group_conf, config_filename)) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&item_group_conf, config_filename)) return; - } gsize = aMalloc( libconfig->setting_length(item_group_conf.root) * sizeof(unsigned int) ); @@ -929,8 +927,8 @@ bool itemdb_read_cached_packages(const char *config_filename) { return true; } void itemdb_read_packages(void) { - config_t item_packages_conf; - config_setting_t *itg = NULL, *it = NULL, *t = NULL; + struct config_t item_packages_conf; + struct config_setting_t *itg = NULL, *it = NULL, *t = NULL; #ifdef RENEWAL const char *config_filename = "db/re/item_packages.conf"; // FIXME hardcoded name #else @@ -946,10 +944,8 @@ void itemdb_read_packages(void) { return; } - if (libconfig->read_file(&item_packages_conf, config_filename)) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&item_packages_conf, config_filename)) return; - } must = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) ); random = aMalloc( libconfig->setting_length(item_packages_conf.root) * sizeof(unsigned int) ); @@ -1161,8 +1157,8 @@ void itemdb_read_packages(void) { } void itemdb_read_chains(void) { - config_t item_chain_conf; - config_setting_t *itc = NULL; + struct config_t item_chain_conf; + struct config_setting_t *itc = NULL; #ifdef RENEWAL const char *config_filename = "db/re/item_chain.conf"; // FIXME hardcoded name #else @@ -1170,10 +1166,8 @@ void itemdb_read_chains(void) { #endif int i = 0, count = 0; - if (libconfig->read_file(&item_chain_conf, config_filename)) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&item_chain_conf, config_filename)) return; - } CREATE(itemdb->chains, struct item_chain, libconfig->setting_length(item_chain_conf.root)); itemdb->chain_count = (unsigned short)libconfig->setting_length(item_chain_conf.root); @@ -1186,7 +1180,7 @@ void itemdb_read_chains(void) { struct item_chain_entry *prev = NULL; const char *name = config_setting_name(itc); int c = 0; - config_setting_t *entry = NULL; + struct config_setting_t *entry = NULL; script->set_constant2(name, i-1, false, false); itemdb->chains[count].qty = (unsigned short)libconfig->setting_length(itc); @@ -1535,7 +1529,7 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) { return item->nameid; } -void itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, const char *source) +void itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source) { // do nothing. plugins can do own work } @@ -1553,9 +1547,9 @@ void itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, co * validation errors. * @return Nameid of the validated entry, or 0 in case of failure. */ -int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) { +int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *source) { struct item_data id = { 0 }; - config_setting_t *t = NULL; + struct config_setting_t *t = NULL; const char *str = NULL; int i32 = 0; bool inherit = false; @@ -1736,7 +1730,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) if ( (t = libconfig->setting_get_member(it, "Trade")) ) { if (config_setting_is_group(t)) { - config_setting_t *tt = NULL; + struct config_setting_t *tt = NULL; if ((tt = libconfig->setting_get_member(t, "override"))) { id.gm_lv_trade_override = libconfig->setting_get_int(tt); @@ -1802,7 +1796,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) if ((t = libconfig->setting_get_member(it, "Nouse"))) { if (config_setting_is_group(t)) { - config_setting_t *nt = NULL; + struct config_setting_t *nt = NULL; if ((nt = libconfig->setting_get_member(t, "override"))) { id.item_usage.override = libconfig->setting_get_int(nt); @@ -1850,7 +1844,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) return itemdb->validate_entry(&id, n, source); } -bool itemdb_lookup_const(const config_setting_t *it, const char *name, int *value) +bool itemdb_lookup_const(const struct config_setting_t *it, const char *name, int *value) { nullpo_retr(false, name); nullpo_retr(false, value); @@ -1879,19 +1873,24 @@ bool itemdb_lookup_const(const config_setting_t *it, const char *name, int *valu */ int itemdb_readdb_libconfig(const char *filename) { bool duplicate[MAX_ITEMDB]; - config_t item_db_conf; - config_setting_t *itdb, *it; + struct config_t item_db_conf; + struct config_setting_t *itdb, *it; char filepath[256]; int i = 0, count = 0; nullpo_ret(filename); + sprintf(filepath, "%s/%s", map->db_path, filename); - memset(&duplicate,0,sizeof(duplicate)); - if( libconfig->read_file(&item_db_conf, filepath) || !(itdb = libconfig->setting_get_member(item_db_conf.root, "item_db")) ) { + if (!libconfig->load_file(&item_db_conf, filepath)) + return 0; + + if ((itdb = libconfig->setting_get_member(item_db_conf.root, "item_db")) == NULL) { ShowError("can't read %s\n", filepath); return 0; } + memset(&duplicate,0,sizeof(duplicate)); + while( (it = libconfig->setting_get_elem(itdb,i++)) ) { int nameid = itemdb->readdb_libconfig_sub(it, i-1, filename); diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 8a0ec389d..b83c27ed2 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -23,10 +23,10 @@ /* #include "map/map.h" */ #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" #include "common/mmo.h" // ITEM_NAME_LENGTH +struct config_setting_t; struct script_code; struct hplugin_data_store; @@ -631,8 +631,8 @@ struct itemdb_interface { void (*read_combos) (void); int (*gendercheck) (struct item_data *id); int (*validate_entry) (struct item_data *entry, int n, const char *source); - void (*readdb_additional_fields) (int itemid, config_setting_t *it, int n, const char *source); - int (*readdb_libconfig_sub) (config_setting_t *it, int n, const char *source); + void (*readdb_additional_fields) (int itemid, struct config_setting_t *it, int n, const char *source); + int (*readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source); int (*readdb_libconfig) (const char *filename); uint64 (*unique_id) (struct map_session_data *sd); void (*read) (bool minimal); @@ -641,7 +641,7 @@ struct itemdb_interface { void (*clear) (bool total); struct item_combo * (*id2combo) (unsigned short id); bool (*is_item_usable) (struct item_data *item); - bool (*lookup_const) (const config_setting_t *it, const char *name, int *value); + bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value); }; #ifdef HERCULES_CORE diff --git a/src/map/map.c b/src/map/map.c index 3dad25fce..c17dd9b0e 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -4982,27 +4982,27 @@ enum bl_type map_zone_bl_type(const char *entry, enum map_zone_skill_subtype *su } /* [Ind/Hercules] */ void read_map_zone_db(void) { - config_t map_zone_db; - config_setting_t *zones = NULL; + struct config_t map_zone_db; + struct config_setting_t *zones = NULL; /* TODO: #ifndef required for re/pre-re */ #ifdef RENEWAL const char *config_filename = "db/re/map_zone_db.conf"; // FIXME hardcoded name #else const char *config_filename = "db/pre-re/map_zone_db.conf"; // FIXME hardcoded name #endif - if (libconfig->read_file(&map_zone_db, config_filename)) + if (!libconfig->load_file(&map_zone_db, config_filename)) return; zones = libconfig->lookup(&map_zone_db, "zones"); if (zones != NULL) { struct map_zone_data *zone; - config_setting_t *zone_e; - config_setting_t *skills; - config_setting_t *items; - config_setting_t *mapflags; - config_setting_t *commands; - config_setting_t *caps; + struct config_setting_t *zone_e; + struct config_setting_t *skills; + struct config_setting_t *items; + struct config_setting_t *mapflags; + struct config_setting_t *commands; + struct config_setting_t *caps; const char *name; const char *zonename; int i,h,v,j; @@ -5054,7 +5054,7 @@ void read_map_zone_db(void) { disabled_skills_count = libconfig->setting_length(skills); /* validate */ for(h = 0; h < libconfig->setting_length(skills); h++) { - config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h); + struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h); name = config_setting_name(skillinfo); if( !map->zone_str2skillid(name) ) { ShowError("map_zone_db: unknown skill (%s) in disabled_skills for zone '%s', skipping skill...\n",name,zone->name); @@ -5069,7 +5069,7 @@ void read_map_zone_db(void) { /* all ok, process */ CREATE( zone->disabled_skills, struct map_zone_disabled_skill_entry *, disabled_skills_count ); for(h = 0, v = 0; h < libconfig->setting_length(skills); h++) { - config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h); + struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h); struct map_zone_disabled_skill_entry * entry; enum bl_type type; name = config_setting_name(skillinfo); @@ -5092,7 +5092,7 @@ void read_map_zone_db(void) { disabled_items_count = libconfig->setting_length(items); /* validate */ for(h = 0; h < libconfig->setting_length(items); h++) { - config_setting_t *item = libconfig->setting_get_elem(items, h); + struct config_setting_t *item = libconfig->setting_get_elem(items, h); name = config_setting_name(item); if( !map->zone_str2itemid(name) ) { ShowError("map_zone_db: unknown item (%s) in disabled_items for zone '%s', skipping item...\n",name,zone->name); @@ -5111,7 +5111,7 @@ void read_map_zone_db(void) { CREATE(zone->cant_disable_items, int, zone->cant_disable_items_count); } for(h = 0, v = 0, j = 0; h < libconfig->setting_length(items); h++) { - config_setting_t *item = libconfig->setting_get_elem(items, h); + struct config_setting_t *item = libconfig->setting_get_elem(items, h); name = config_setting_name(item); if( libconfig->setting_get_bool(item) ) { /* only add if enabled */ @@ -5143,7 +5143,7 @@ void read_map_zone_db(void) { disabled_commands_count = libconfig->setting_length(commands); /* validate */ for(h = 0; h < libconfig->setting_length(commands); h++) { - config_setting_t *command = libconfig->setting_get_elem(commands, h); + struct config_setting_t *command = libconfig->setting_get_elem(commands, h); name = config_setting_name(command); if( !atcommand->exists(name) ) { ShowError("map_zone_db: unknown command '%s' in disabled_commands for zone '%s', skipping entry...\n",name,zone->name); @@ -5158,7 +5158,7 @@ void read_map_zone_db(void) { /* all ok, process */ CREATE( zone->disabled_commands, struct map_zone_disabled_command_entry *, disabled_commands_count ); for(h = 0, v = 0; h < libconfig->setting_length(commands); h++) { - config_setting_t *command = libconfig->setting_get_elem(commands, h); + struct config_setting_t *command = libconfig->setting_get_elem(commands, h); struct map_zone_disabled_command_entry * entry; int group_lv; name = config_setting_name(command); @@ -5179,7 +5179,7 @@ void read_map_zone_db(void) { capped_skills_count = libconfig->setting_length(caps); /* validate */ for(h = 0; h < libconfig->setting_length(caps); h++) { - config_setting_t *cap = libconfig->setting_get_elem(caps, h); + struct config_setting_t *cap = libconfig->setting_get_elem(caps, h); name = config_setting_name(cap); if( !map->zone_str2skillid(name) ) { ShowError("map_zone_db: unknown skill (%s) in skill_damage_cap for zone '%s', skipping skill...\n",name,zone->name); @@ -5194,7 +5194,7 @@ void read_map_zone_db(void) { /* all ok, process */ CREATE( zone->capped_skills, struct map_zone_skill_damage_cap_entry *, capped_skills_count ); for(h = 0, v = 0; h < libconfig->setting_length(caps); h++) { - config_setting_t *cap = libconfig->setting_get_elem(caps, h); + struct config_setting_t *cap = libconfig->setting_get_elem(caps, h); struct map_zone_skill_damage_cap_entry * entry; enum bl_type type; name = config_setting_name(cap); @@ -5219,8 +5219,8 @@ void read_map_zone_db(void) { /* process inheritance, aka loop through the whole thing again :P */ for (i = 0; i < zone_count; ++i) { - config_setting_t *inherit_tree = NULL; - config_setting_t *new_entry = NULL; + struct config_setting_t *inherit_tree = NULL; + struct config_setting_t *new_entry = NULL; int inherit_count; zone_e = libconfig->setting_get_elem(zones, i); @@ -5278,7 +5278,7 @@ void read_map_zone_db(void) { for(j = 0; j < disabled_skills_count_i; j++) { int k; for(k = 0; k < disabled_skills_count; k++) { - config_setting_t *skillinfo = libconfig->setting_get_elem(skills, k); + struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, k); if( map->zone_str2skillid(config_setting_name(skillinfo)) == izone->disabled_skills[j]->nameid ) { break; } @@ -5302,7 +5302,7 @@ void read_map_zone_db(void) { for(j = 0; j < disabled_items_count_i; j++) { int k; for(k = 0; k < disabled_items_count; k++) { - config_setting_t *item = libconfig->setting_get_elem(items, k); + struct config_setting_t *item = libconfig->setting_get_elem(items, k); name = config_setting_name(item); @@ -5348,7 +5348,7 @@ void read_map_zone_db(void) { for(j = 0; j < disabled_commands_count_i; j++) { int k; for(k = 0; k < disabled_commands_count; k++) { - config_setting_t *command = libconfig->setting_get_elem(commands, k); + struct config_setting_t *command = libconfig->setting_get_elem(commands, k); if( atcommand->exists(config_setting_name(command))->func == izone->disabled_commands[j]->cmd ) { break; } @@ -5372,7 +5372,7 @@ void read_map_zone_db(void) { for(j = 0; j < capped_skills_count_i; j++) { int k; for(k = 0; k < capped_skills_count; k++) { - config_setting_t *cap = libconfig->setting_get_elem(caps, k); + struct config_setting_t *cap = libconfig->setting_get_elem(caps, k); if( map->zone_str2skillid(config_setting_name(cap)) == izone->capped_skills[j]->nameid ) { break; } diff --git a/src/map/mob.c b/src/map/mob.c index 86f3ddc0d..2ae54ba69 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -46,6 +46,7 @@ #include "map/status.h" #include "common/HPM.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/db.h" #include "common/ers.h" #include "common/memmgr.h" @@ -3691,7 +3692,7 @@ static inline int mob_parse_dbrow_cap_value(int class_, int min, int max, int va * (mob_id is expected to be already set). * @param[in] t The libconfig entry. */ -void mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) +void mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) { int i32; if (mob->lookup_const(t, "Str", &i32) && i32 >= 0) { @@ -3722,10 +3723,10 @@ void mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) * * @return The parsed mode. */ -int mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) +int mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) { int mode = 0; - config_setting_t *t2; + struct config_setting_t *t2; if ((t2 = libconfig->setting_get_member(t, "CanMove"))) mode |= libconfig->setting_get_bool(t2) ? MD_CANMOVE : 0; @@ -3768,9 +3769,9 @@ int mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) * (mob_id is expected to be already set). * @param[in] t The libconfig entry. */ -void mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) +void mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t) { - config_setting_t *drop; + struct config_setting_t *drop; int i = 0; int idx = 0; int i32; @@ -3824,9 +3825,9 @@ void mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) * (mob_id, status.mode are expected to be already set). * @param[in] t The libconfig entry. */ -void mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) +void mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) { - config_setting_t *drop; + struct config_setting_t *drop; int i = 0; int idx = 0; int i32; @@ -4051,10 +4052,10 @@ int mob_db_validate_entry(struct mob_db *entry, int n, const char *source) * validation errors. * @return Mob ID of the validated entry, or 0 in case of failure. */ -int mob_read_db_sub(config_setting_t *mobt, int n, const char *source) +int mob_read_db_sub(struct config_setting_t *mobt, int n, const char *source) { struct mob_db md = { 0 }; - config_setting_t *t = NULL; + struct config_setting_t *t = NULL; const char *str = NULL; int i32 = 0; bool inherit = false; @@ -4359,12 +4360,12 @@ int mob_read_db_sub(config_setting_t *mobt, int n, const char *source) * @param[in] source Source of the entry (file name), to be displayed in * case of validation errors. */ -void mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *t, int n, const char *source) +void mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *t, int n, const char *source) { // do nothing. plugins can do own work } -bool mob_lookup_const(const config_setting_t *it, const char *name, int *value) +bool mob_lookup_const(const struct config_setting_t *it, const char *name, int *value) { if (libconfig->setting_lookup_int(it, name, value)) { @@ -4382,7 +4383,7 @@ bool mob_lookup_const(const config_setting_t *it, const char *name, int *value) return false; } -bool mob_get_const(const config_setting_t *it, int *value) +bool mob_get_const(const struct config_setting_t *it, int *value) { const char *str = config_setting_get_string(it); if (str && *str && script->get_constant(str, value)) @@ -4419,10 +4420,10 @@ void mob_readdb(void) { int mob_read_libconfig(const char *filename, bool ignore_missing) { bool duplicate[MAX_MOB_DB] = { 0 }; - config_t mob_db_conf; + struct config_t mob_db_conf; char filepath[256]; - config_setting_t *mdb; - config_setting_t *t; + struct config_setting_t *mdb; + struct config_setting_t *t; int i = 0, count = 0; nullpo_ret(filename); @@ -4431,7 +4432,10 @@ int mob_read_libconfig(const char *filename, bool ignore_missing) if (ignore_missing && !exists(filepath)) return 0; - if (libconfig->read_file(&mob_db_conf, filepath) || !(mdb = libconfig->setting_get_member(mob_db_conf.root, "mob_db"))) { + if (!libconfig->load_file(&mob_db_conf, filepath)) + return 0; + + if ((mdb = libconfig->setting_get_member(mob_db_conf.root, "mob_db")) == NULL) { ShowError("can't read %s\n", filepath); return 0; } diff --git a/src/map/mob.h b/src/map/mob.h index 9a5239b11..00e2b0723 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -510,16 +510,16 @@ struct mob_interface { unsigned int (*drop_adjust) (int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max); void (*item_dropratio_adjust) (int nameid, int mob_id, int *rate_adjust); void (*readdb) (void); - bool (*lookup_const) (const config_setting_t *it, const char *name, int *value); - bool (*get_const) (const config_setting_t *it, int *value); + bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value); + bool (*get_const) (const struct config_setting_t *it, int *value); int (*db_validate_entry) (struct mob_db *entry, int n, const char *source); int (*read_libconfig) (const char *filename, bool ignore_missing); - void (*read_db_additional_fields) (struct mob_db *entry, config_setting_t *it, int n, const char *source); - int (*read_db_sub) (config_setting_t *mobt, int id, const char *source); - void (*read_db_drops_sub) (struct mob_db *entry, config_setting_t *t); - void (*read_db_mvpdrops_sub) (struct mob_db *entry, config_setting_t *t); - int (*read_db_mode_sub) (struct mob_db *entry, config_setting_t *t); - void (*read_db_stats_sub) (struct mob_db *entry, config_setting_t *t); + void (*read_db_additional_fields) (struct mob_db *entry, struct config_setting_t *it, int n, const char *source); + int (*read_db_sub) (struct config_setting_t *mobt, int id, const char *source); + void (*read_db_drops_sub) (struct mob_db *entry, struct config_setting_t *t); + void (*read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t); + int (*read_db_mode_sub) (struct mob_db *entry, struct config_setting_t *t); + void (*read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t); void (*name_constants) (void); bool (*readdb_mobavail) (char *str[], int columns, int current); int (*read_randommonster) (void); diff --git a/src/map/pc.c b/src/map/pc.c index 8d1df71a9..fb6fc523c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -10642,8 +10642,8 @@ int pc_split_atoui(char* str, unsigned int* val, char sep, int max) */ void pc_read_skill_tree(void) { - config_t skill_tree_conf; - config_setting_t *skt = NULL; + struct config_t skill_tree_conf; + struct config_setting_t *skt = NULL; char config_filename[128]; int i = 0; struct s_mapiterator *iter; @@ -10651,14 +10651,12 @@ void pc_read_skill_tree(void) bool loaded[CLASS_COUNT] = { false }; safesnprintf(config_filename, sizeof(config_filename), "%s/"DBPATH"skill_tree.conf", map->db_path); - if (libconfig->read_file(&skill_tree_conf, config_filename)) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&skill_tree_conf, config_filename)) return; - } // Foreach job while ((skt = libconfig->setting_get_elem(skill_tree_conf.root, i++))) { - config_setting_t *t = NULL; + struct config_setting_t *t = NULL; int job_idx; const char *job_name = config_setting_name(skt); int job_id = pc->check_job_name(job_name); @@ -10748,11 +10746,11 @@ void pc_read_skill_tree(void) } if ((t = libconfig->setting_get_member(skt, "skills")) != NULL) { int j = 0; - config_setting_t *sk = NULL; + struct config_setting_t *sk = NULL; // Foreach skill while ((sk = libconfig->setting_get_elem(t, j++)) != NULL) { int skill_id, sk_idx; - config_setting_t *rsk = NULL; + struct config_setting_t *rsk = NULL; const char *sk_name = config_setting_name(sk); struct skill_tree_entry *tree_entry = NULL; diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c index bd46b9616..72935adc3 100644 --- a/src/map/pc_groups.c +++ b/src/map/pc_groups.c @@ -63,12 +63,12 @@ static inline GroupSettings* name2group(const char* group_name) * @private */ static void read_config(void) { - config_t pc_group_config; - config_setting_t *groups = NULL; + struct config_t pc_group_config; + struct config_setting_t *groups = NULL; const char *config_filename = "conf/groups.conf"; // FIXME hardcoded name int group_count = 0; - if (libconfig->read_file(&pc_group_config, config_filename)) + if (!libconfig->load_file(&pc_group_config, config_filename)) return; groups = libconfig->lookup(&pc_group_config, "groups"); @@ -83,7 +83,7 @@ static void read_config(void) { int id = 0, level = 0; const char *groupname = NULL; int log_commands = 0; - config_setting_t *group = libconfig->setting_get_elem(groups, i); + struct config_setting_t *group = libconfig->setting_get_elem(groups, i); if (!libconfig->setting_lookup_int(group, "id", &id)) { ShowConfigWarning(group, "pc_groups:read_config: \"groups\" list member #%d has undefined id, removing...", i); @@ -106,7 +106,7 @@ static void read_config(void) { if (!libconfig->setting_lookup_string(group, "name", &groupname)) { char temp[20]; - config_setting_t *name = NULL; + struct config_setting_t *name = NULL; snprintf(temp, sizeof(temp), "Group %d", id); if ((name = config_setting_add(group, "name", CONFIG_TYPE_STRING)) == NULL || !config_setting_set_string(name, temp)) { @@ -148,7 +148,7 @@ static void read_config(void) { // Check if all commands and permissions exist iter = db_iterator(pcg->db); for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) { - config_setting_t *commands = group_settings->commands, *permissions = group_settings->permissions; + struct config_setting_t *commands = group_settings->commands, *permissions = group_settings->permissions; int count = 0; // Make sure there is "commands" group @@ -157,7 +157,7 @@ static void read_config(void) { count = libconfig->setting_length(commands); for (i = 0; i < count; ++i) { - config_setting_t *command = libconfig->setting_get_elem(commands, i); + struct config_setting_t *command = libconfig->setting_get_elem(commands, i); const char *name = config_setting_name(command); if (!atcommand->exists(name)) { ShowConfigWarning(command, "pc_groups:read_config: non-existent command name '%s', removing...", name); @@ -173,7 +173,7 @@ static void read_config(void) { count = libconfig->setting_length(permissions); for(i = 0; i < count; ++i) { - config_setting_t *permission = libconfig->setting_get_elem(permissions, i); + struct config_setting_t *permission = libconfig->setting_get_elem(permissions, i); const char *name = config_setting_name(permission); int j; @@ -193,7 +193,7 @@ static void read_config(void) { while (i < group_count) { iter = db_iterator(pcg->db); for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) { - config_setting_t *inherit = NULL, + struct config_setting_t *inherit = NULL, *commands = group_settings->commands, *permissions = group_settings->permissions; int j, inherit_count = 0, done = 0; @@ -258,11 +258,11 @@ static void read_config(void) { // Pack permissions into GroupSettings.e_permissions for faster checking iter = db_iterator(pcg->db); for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) { - config_setting_t *permissions = group_settings->permissions; + struct config_setting_t *permissions = group_settings->permissions; int count = libconfig->setting_length(permissions); for (i = 0; i < count; ++i) { - config_setting_t *perm = libconfig->setting_get_elem(permissions, i); + struct config_setting_t *perm = libconfig->setting_get_elem(permissions, i); const char *name = config_setting_name(perm); int val = libconfig->setting_get_bool(perm); int j; @@ -280,9 +280,9 @@ static void read_config(void) { // to atcommand->load_group() for processing. if (group_count > 0) { GroupSettings **pc_groups = NULL; - config_setting_t **commands = NULL; + struct config_setting_t **commands = NULL; CREATE(pc_groups, GroupSettings*, group_count); - CREATE(commands, config_setting_t*, group_count); + CREATE(commands, struct config_setting_t*, group_count); i = 0; iter = db_iterator(pcg->db); for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) { diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h index 62704fb12..3f95237b7 100644 --- a/src/map/pc_groups.h +++ b/src/map/pc_groups.h @@ -22,9 +22,11 @@ #define MAP_PC_GROUPS_H #include "common/hercules.h" -#include "common/conf.h" #include "common/db.h" +/* Forward Declarations */ +struct config_setting_t; + /// PC permissions enum e_pc_permission { PC_PERM_NONE = 0, // #0 @@ -66,11 +68,11 @@ struct GroupSettings { bool log_commands; // groups.[].log_commands int index; // internal index of the group (contiguous range starting at 0) [Ind] /// Following are used/available only during config reading - config_setting_t *commands; // groups.[].commands - config_setting_t *permissions; // groups.[].permissions - config_setting_t *inherit; // groups.[].inherit + struct config_setting_t *commands; // groups.[].commands + struct config_setting_t *permissions; // groups.[].permissions + struct config_setting_t *inherit; // groups.[].inherit bool inheritance_done; // have all inheritance rules been evaluated? - config_setting_t *root; // groups.[] + struct config_setting_t *root; // groups.[] }; typedef struct GroupSettings GroupSettings; diff --git a/src/map/quest.c b/src/map/quest.c index 0dbea56f8..7e2421c79 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -425,10 +425,10 @@ int quest_check(struct map_session_data *sd, int quest_id, enum quest_check_type * @return The parsed quest entry. * @retval NULL in case of errors. */ -struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *source) +struct quest_db *quest_read_db_sub(struct config_setting_t *cs, int n, const char *source) { struct quest_db *entry = NULL; - config_setting_t *t = NULL; + struct config_setting_t *t = NULL; int i32 = 0, quest_id; const char *str = NULL; /* @@ -477,7 +477,7 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour for (i = 0; i < len && entry->objectives_count < MAX_QUEST_OBJECTIVES; i++) { // Note: We ensure that objectives_count < MAX_QUEST_OBJECTIVES because // quest_log (as well as the client) expect this maximum size. - config_setting_t *tt = libconfig->setting_get_elem(t, i); + struct config_setting_t *tt = libconfig->setting_get_elem(t, i); int mob_id = 0, count = 0; if (!tt) break; @@ -496,7 +496,7 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour if ((t=libconfig->setting_get_member(cs, "Drops")) && config_setting_is_list(t)) { int i, len = libconfig->setting_length(t); for (i = 0; i < len; i++) { - config_setting_t *tt = libconfig->setting_get_elem(t, i); + struct config_setting_t *tt = libconfig->setting_get_elem(t, i); int mob_id = 0, nameid = 0, rate = 0; if (!tt) break; @@ -527,13 +527,16 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour int quest_read_db(void) { char filepath[256]; - config_t quest_db_conf; - config_setting_t *qdb = NULL, *q = NULL; + struct config_t quest_db_conf; + struct config_setting_t *qdb = NULL, *q = NULL; int i = 0, count = 0; const char *filename = "quest_db.conf"; sprintf(filepath, "%s/%s", map->db_path, filename); - if (libconfig->read_file(&quest_db_conf, filepath) || !(qdb = libconfig->setting_get_member(quest_db_conf.root, "quest_db"))) { + if (!libconfig->load_file(&quest_db_conf, filepath)) + return -1; + + if ((qdb = libconfig->setting_get_member(quest_db_conf.root, "quest_db")) == NULL) { ShowError("can't read %s\n", filepath); return -1; } diff --git a/src/map/quest.h b/src/map/quest.h index 8e2cb4e23..e0768ef40 100644 --- a/src/map/quest.h +++ b/src/map/quest.h @@ -22,10 +22,11 @@ #define MAP_QUEST_H #include "common/hercules.h" -#include "common/conf.h" #include "common/mmo.h" // enum quest_state +/* Forward Declarations */ struct block_list; +struct config_setting_t; struct map_session_data; #define MAX_QUEST_DB (60355+1) // Highest quest ID + 1 @@ -77,7 +78,7 @@ struct quest_interface { int (*check) (struct map_session_data *sd, int quest_id, enum quest_check_type type); void (*clear) (void); int (*read_db) (void); - struct quest_db *(*read_db_sub) (config_setting_t *cs, int n, const char *source); + struct quest_db *(*read_db_sub) (struct config_setting_t *cs, int n, const char *source); }; #ifdef HERCULES_CORE diff --git a/src/map/script.c b/src/map/script.c index f3c839555..4b3bf960c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -55,6 +55,7 @@ #include "map/storage.h" #include "map/unit.h" #include "common/cbasetypes.h" +#include "common/conf.h" #include "common/memmgr.h" #include "common/md5calc.h" #include "common/mmo.h" // NEW_CARTS @@ -2289,15 +2290,18 @@ void script_set_constant2(const char *name, int value, bool is_parameter, bool i */ void read_constdb(void) { - config_t constants_conf; + struct config_t constants_conf; char filepath[256]; - config_setting_t *cdb; - config_setting_t *t; + struct config_setting_t *cdb; + struct config_setting_t *t; int i = 0; sprintf(filepath, "%s/constants.conf", map->db_path); - if (libconfig->read_file(&constants_conf, filepath) || !(cdb = libconfig->setting_get_member(constants_conf.root, "constants_db"))) { + if (!libconfig->load_file(&constants_conf, filepath)) + return; + + if ((cdb = libconfig->setting_get_member(constants_conf.root, "constants_db")) == NULL) { ShowError("can't read %s\n", filepath); return; } @@ -4800,9 +4804,9 @@ uint8 script_add_language(const char *name) { * Goes thru db/translations.conf file **/ void script_load_translations(void) { - config_t translations_conf; + struct config_t translations_conf; const char *config_filename = "db/translations.conf"; // FIXME hardcoded name - config_setting_t *translations = NULL; + struct config_setting_t *translations = NULL; int i, size; uint32 total = 0; uint8 lang_id = 0, k; @@ -4822,12 +4826,10 @@ void script_load_translations(void) { script->add_language("English");/* 0 is default, which is whatever is in the npc files hardcoded (in our case, English) */ - if (libconfig->read_file(&translations_conf, config_filename)) { - ShowError("load_translations: can't read '%s'\n", config_filename); + if (!libconfig->load_file(&translations_conf, config_filename)) return; - } - if( !(translations = libconfig->lookup(&translations_conf, "translations")) ) { + if ((translations = libconfig->lookup(&translations_conf, "translations")) == NULL) { ShowError("load_translations: invalid format on '%s'\n",config_filename); return; } diff --git a/src/map/status.c b/src/map/status.c index 26db1750b..39df5c693 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -12556,9 +12556,9 @@ int status_get_sc_type(sc_type type) { return status->dbs->sc_conf[type]; } -void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) +void status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb) { - config_setting_t *temp = NULL; + struct config_setting_t *temp = NULL; int i32 = 0; struct { @@ -12698,7 +12698,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) if ((temp = libconfig->setting_get_member(jdb, "BaseASPD"))) { int widx = 0; - config_setting_t *wpn = NULL; + struct config_setting_t *wpn = NULL; while ((wpn = libconfig->setting_get_elem(temp, widx++))) { int w, wlen = ARRAYLENGTH(wnames); const char *wname = config_setting_name(wpn); @@ -12714,7 +12714,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) if ((temp = libconfig->setting_get_member(jdb, "HPTable"))) { int level = 0, avg_increment, base; - config_setting_t *hp = NULL; + struct config_setting_t *hp = NULL; while (level <= MAX_LEVEL && (hp = libconfig->setting_get_elem(temp, level)) != NULL) { i32 = libconfig->setting_get_int(hp); status->dbs->HP_table[idx][++level] = min(i32, battle_config.max_hp); @@ -12734,7 +12734,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) if ((temp = libconfig->setting_get_member(jdb, "SPTable"))) { int level = 0, avg_increment, base; - config_setting_t *sp = NULL; + struct config_setting_t *sp = NULL; while (level <= MAX_LEVEL && (sp = libconfig->setting_get_elem(temp, level)) != NULL) { i32 = libconfig->setting_get_int(sp); status->dbs->SP_table[idx][++level] = min(i32, battle_config.max_sp); @@ -12762,18 +12762,17 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) *------------------------------------------*/ void status_read_job_db(void) { /* [malufett/Hercules] */ int i = 0; - config_t job_db_conf; - config_setting_t *jdb = NULL; + struct config_t job_db_conf; + struct config_setting_t *jdb = NULL; #ifdef RENEWAL_ASPD const char *config_filename = "db/re/job_db.conf"; #else const char *config_filename = "db/pre-re/job_db.conf"; #endif - if ( libconfig->read_file(&job_db_conf, config_filename) ) { - ShowError("can't read %s\n", config_filename); + if (!libconfig->load_file(&job_db_conf, config_filename)) return; - } + while ( (jdb = libconfig->setting_get_elem(job_db_conf.root, i++)) ) { int class_, idx; const char *name = config_setting_name(jdb); @@ -12833,9 +12832,9 @@ bool status_readdb_sizefix(char* fields[], int columns, int current) * validation errors. * @return # of the validated entry, or 0 in case of failure. */ -int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, const char *source) +int status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source) { - config_setting_t *rate = NULL; + struct config_setting_t *rate = NULL; int type = REFINE_TYPE_ARMOR, bonus_per_level = 0, rnd_bonus_v = 0, rnd_bonus_lv = 0; char lv[4]; nullpo_ret(r); @@ -12866,7 +12865,7 @@ int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, co } if ((rate=libconfig->setting_get_member(r, "Rates")) != NULL && config_setting_is_group(rate)) { - config_setting_t *t = NULL; + struct config_setting_t *t = NULL; bool duplicate[MAX_REFINE]; int bonus[MAX_REFINE], rnd_bonus[MAX_REFINE], chance[MAX_REFINE]; int i; @@ -12926,17 +12925,16 @@ int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, co */ int status_readdb_refine_libconfig(const char *filename) { bool duplicate[REFINE_TYPE_MAX]; - config_t refine_db_conf; - config_setting_t *r; + struct config_t refine_db_conf; + struct config_setting_t *r; char filepath[256]; int i = 0, count = 0,type = 0; sprintf(filepath, "%s/%s", map->db_path, filename); - memset(&duplicate,0,sizeof(duplicate)); - if( libconfig->read_file(&refine_db_conf, filepath) ) { - ShowError("can't read %s\n", filepath); + if (!libconfig->load_file(&refine_db_conf, filepath)) return 0; - } + + memset(&duplicate,0,sizeof(duplicate)); while((r = libconfig->setting_get_elem(refine_db_conf.root,i++))) { char *name = config_setting_name(r); diff --git a/src/map/status.h b/src/map/status.h index be6d4c209..85219b280 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -21,11 +21,11 @@ #ifndef MAP_STATUS_H #define MAP_STATUS_H -#include "common/conf.h" #include "common/hercules.h" #include "common/mmo.h" // NEW_CARTS struct block_list; +struct config_setting_t; struct elemental_data; struct homun_data; struct mercenary_data; @@ -2298,10 +2298,10 @@ struct status_interface { bool (*readdb_job2) (char *fields[], int columns, int current); bool (*readdb_sizefix) (char *fields[], int columns, int current); int (*readdb_refine_libconfig) (const char *filename); - int (*readdb_refine_libconfig_sub) (config_setting_t *r, const char *name, const char *source); + int (*readdb_refine_libconfig_sub) (struct config_setting_t *r, const char *name, const char *source); bool (*readdb_scconfig) (char *fields[], int columns, int current); void (*read_job_db) (void); - void (*read_job_db_sub) (int idx, const char *name, config_setting_t *jdb); + void (*read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb); }; #ifdef HERCULES_CORE diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc index 9d8a2750d..849354fa1 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc @@ -610,10 +610,10 @@ struct { struct HPMHookPoint *HP_libconfig_read_post; struct HPMHookPoint *HP_libconfig_write_pre; struct HPMHookPoint *HP_libconfig_write_post; - struct HPMHookPoint *HP_libconfig_set_auto_convert_pre; - struct HPMHookPoint *HP_libconfig_set_auto_convert_post; - struct HPMHookPoint *HP_libconfig_get_auto_convert_pre; - struct HPMHookPoint *HP_libconfig_get_auto_convert_post; + struct HPMHookPoint *HP_libconfig_set_options_pre; + struct HPMHookPoint *HP_libconfig_set_options_post; + struct HPMHookPoint *HP_libconfig_get_options_pre; + struct HPMHookPoint *HP_libconfig_get_options_post; struct HPMHookPoint *HP_libconfig_read_string_pre; struct HPMHookPoint *HP_libconfig_read_string_post; struct HPMHookPoint *HP_libconfig_read_file_src_pre; @@ -638,6 +638,8 @@ struct { struct HPMHookPoint *HP_libconfig_setting_get_bool_post; struct HPMHookPoint *HP_libconfig_setting_get_string_pre; struct HPMHookPoint *HP_libconfig_setting_get_string_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_post; struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre; struct HPMHookPoint *HP_libconfig_setting_lookup_int_post; struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre; @@ -700,8 +702,6 @@ struct { struct HPMHookPoint *HP_libconfig_setting_set_hook_post; struct HPMHookPoint *HP_libconfig_lookup_pre; struct HPMHookPoint *HP_libconfig_lookup_post; - struct HPMHookPoint *HP_libconfig_lookup_from_pre; - struct HPMHookPoint *HP_libconfig_lookup_from_post; struct HPMHookPoint *HP_libconfig_lookup_int_pre; struct HPMHookPoint *HP_libconfig_lookup_int_post; struct HPMHookPoint *HP_libconfig_lookup_int64_pre; @@ -712,8 +712,8 @@ struct { struct HPMHookPoint *HP_libconfig_lookup_bool_post; struct HPMHookPoint *HP_libconfig_lookup_string_pre; struct HPMHookPoint *HP_libconfig_lookup_string_post; - struct HPMHookPoint *HP_libconfig_read_file_pre; - struct HPMHookPoint *HP_libconfig_read_file_post; + struct HPMHookPoint *HP_libconfig_load_file_pre; + struct HPMHookPoint *HP_libconfig_load_file_post; struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre; struct HPMHookPoint *HP_libconfig_setting_copy_simple_post; struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre; @@ -722,6 +722,26 @@ struct { struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post; struct HPMHookPoint *HP_libconfig_setting_copy_pre; struct HPMHookPoint *HP_libconfig_setting_copy_post; + struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre; + struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post; + struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre; + struct HPMHookPoint *HP_libconfig_setting_get_uint32_post; + struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre; + struct HPMHookPoint *HP_libconfig_setting_get_uint16_post; + struct HPMHookPoint *HP_libconfig_setting_get_int16_pre; + struct HPMHookPoint *HP_libconfig_setting_get_int16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post; + struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre; + struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post; struct HPMHookPoint *HP_loginif_init_pre; struct HPMHookPoint *HP_loginif_init_post; struct HPMHookPoint *HP_loginif_final_pre; @@ -1989,10 +2009,10 @@ struct { int HP_libconfig_read_post; int HP_libconfig_write_pre; int HP_libconfig_write_post; - int HP_libconfig_set_auto_convert_pre; - int HP_libconfig_set_auto_convert_post; - int HP_libconfig_get_auto_convert_pre; - int HP_libconfig_get_auto_convert_post; + int HP_libconfig_set_options_pre; + int HP_libconfig_set_options_post; + int HP_libconfig_get_options_pre; + int HP_libconfig_get_options_post; int HP_libconfig_read_string_pre; int HP_libconfig_read_string_post; int HP_libconfig_read_file_src_pre; @@ -2017,6 +2037,8 @@ struct { int HP_libconfig_setting_get_bool_post; int HP_libconfig_setting_get_string_pre; int HP_libconfig_setting_get_string_post; + int HP_libconfig_setting_lookup_pre; + int HP_libconfig_setting_lookup_post; int HP_libconfig_setting_lookup_int_pre; int HP_libconfig_setting_lookup_int_post; int HP_libconfig_setting_lookup_int64_pre; @@ -2079,8 +2101,6 @@ struct { int HP_libconfig_setting_set_hook_post; int HP_libconfig_lookup_pre; int HP_libconfig_lookup_post; - int HP_libconfig_lookup_from_pre; - int HP_libconfig_lookup_from_post; int HP_libconfig_lookup_int_pre; int HP_libconfig_lookup_int_post; int HP_libconfig_lookup_int64_pre; @@ -2091,8 +2111,8 @@ struct { int HP_libconfig_lookup_bool_post; int HP_libconfig_lookup_string_pre; int HP_libconfig_lookup_string_post; - int HP_libconfig_read_file_pre; - int HP_libconfig_read_file_post; + int HP_libconfig_load_file_pre; + int HP_libconfig_load_file_post; int HP_libconfig_setting_copy_simple_pre; int HP_libconfig_setting_copy_simple_post; int HP_libconfig_setting_copy_elem_pre; @@ -2101,6 +2121,26 @@ struct { int HP_libconfig_setting_copy_aggregate_post; int HP_libconfig_setting_copy_pre; int HP_libconfig_setting_copy_post; + int HP_libconfig_setting_get_bool_real_pre; + int HP_libconfig_setting_get_bool_real_post; + int HP_libconfig_setting_get_uint32_pre; + int HP_libconfig_setting_get_uint32_post; + int HP_libconfig_setting_get_uint16_pre; + int HP_libconfig_setting_get_uint16_post; + int HP_libconfig_setting_get_int16_pre; + int HP_libconfig_setting_get_int16_post; + int HP_libconfig_setting_lookup_bool_real_pre; + int HP_libconfig_setting_lookup_bool_real_post; + int HP_libconfig_setting_lookup_uint32_pre; + int HP_libconfig_setting_lookup_uint32_post; + int HP_libconfig_setting_lookup_uint16_pre; + int HP_libconfig_setting_lookup_uint16_post; + int HP_libconfig_setting_lookup_int16_pre; + int HP_libconfig_setting_lookup_int16_post; + int HP_libconfig_setting_lookup_mutable_string_pre; + int HP_libconfig_setting_lookup_mutable_string_post; + int HP_libconfig_lookup_mutable_string_pre; + int HP_libconfig_lookup_mutable_string_post; int HP_loginif_init_pre; int HP_loginif_init_post; int HP_loginif_final_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc index fe3e806b1..7f359a9b4 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc @@ -335,8 +335,8 @@ struct HookingPointData HookingPoints[] = { /* libconfig */ { HP_POP(libconfig->read, HP_libconfig_read) }, { HP_POP(libconfig->write, HP_libconfig_write) }, - { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) }, - { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) }, + { HP_POP(libconfig->set_options, HP_libconfig_set_options) }, + { HP_POP(libconfig->get_options, HP_libconfig_get_options) }, { HP_POP(libconfig->read_string, HP_libconfig_read_string) }, { HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) }, { HP_POP(libconfig->write_file, HP_libconfig_write_file) }, @@ -349,6 +349,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) }, { HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) }, { HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) }, + { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) }, { HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) }, { HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) }, { HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) }, @@ -380,17 +381,26 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) }, { HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) }, { HP_POP(libconfig->lookup, HP_libconfig_lookup) }, - { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) }, { HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) }, { HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) }, { HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) }, { HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) }, { HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) }, - { HP_POP(libconfig->read_file, HP_libconfig_read_file) }, + { HP_POP(libconfig->load_file, HP_libconfig_load_file) }, { HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) }, { HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) }, { HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) }, { HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) }, + { HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) }, + { HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) }, + { HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) }, + { HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) }, + { HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) }, + { HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) }, + { HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) }, + { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) }, + { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) }, + { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) }, /* loginif */ { HP_POP(loginif->init, HP_loginif_init) }, { HP_POP(loginif->final, HP_loginif_final) }, diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc index e6100ffdd..10b518e98 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc @@ -7824,11 +7824,11 @@ int HP_inter_storage_parse_frommap(int fd) { return retVal___; } /* libconfig */ -int HP_libconfig_read(config_t *config, FILE *stream) { +int HP_libconfig_read(struct config_t *config, FILE *stream) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_pre ) { - int (*preHookFunc) (config_t *config, FILE *stream); + int (*preHookFunc) (struct config_t *config, FILE *stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func; @@ -7843,7 +7843,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) { retVal___ = HPMHooks.source.libconfig.read(config, stream); } if( HPMHooks.count.HP_libconfig_read_post ) { - int (*postHookFunc) (int retVal___, config_t *config, FILE *stream); + int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, stream); @@ -7851,10 +7851,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) { } return retVal___; } -void HP_libconfig_write(const config_t *config, FILE *stream) { +void HP_libconfig_write(const struct config_t *config, FILE *stream) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_write_pre ) { - void (*preHookFunc) (const config_t *config, FILE *stream); + void (*preHookFunc) (const struct config_t *config, FILE *stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func; @@ -7869,7 +7869,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) { HPMHooks.source.libconfig.write(config, stream); } if( HPMHooks.count.HP_libconfig_write_post ) { - void (*postHookFunc) (const config_t *config, FILE *stream); + void (*postHookFunc) (const struct config_t *config, FILE *stream); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func; postHookFunc(config, stream); @@ -7877,14 +7877,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) { } return; } -void HP_libconfig_set_auto_convert(config_t *config, int flag) { +void HP_libconfig_set_options(struct config_t *config, int options) { int hIndex = 0; - if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) { - void (*preHookFunc) (config_t *config, int *flag); + if( HPMHooks.count.HP_libconfig_set_options_pre ) { + void (*preHookFunc) (struct config_t *config, int *options); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func; - preHookFunc(config, &flag); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func; + preHookFunc(config, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7892,25 +7892,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) { } } { - HPMHooks.source.libconfig.set_auto_convert(config, flag); + HPMHooks.source.libconfig.set_options(config, options); } - if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) { - void (*postHookFunc) (config_t *config, int *flag); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func; - postHookFunc(config, &flag); + if( HPMHooks.count.HP_libconfig_set_options_post ) { + void (*postHookFunc) (struct config_t *config, int *options); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func; + postHookFunc(config, &options); } } return; } -int HP_libconfig_get_auto_convert(const config_t *config) { +int HP_libconfig_get_options(const struct config_t *config) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) { - int (*preHookFunc) (const config_t *config); + if( HPMHooks.count.HP_libconfig_get_options_pre ) { + int (*preHookFunc) (const struct config_t *config); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func; retVal___ = preHookFunc(config); } if( *HPMforce_return ) { @@ -7919,22 +7919,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) { } } { - retVal___ = HPMHooks.source.libconfig.get_auto_convert(config); + retVal___ = HPMHooks.source.libconfig.get_options(config); } - if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) { - int (*postHookFunc) (int retVal___, const config_t *config); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func; + if( HPMHooks.count.HP_libconfig_get_options_post ) { + int (*postHookFunc) (int retVal___, const struct config_t *config); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func; retVal___ = postHookFunc(retVal___, config); } } return retVal___; } -int HP_libconfig_read_string(config_t *config, const char *str) { +int HP_libconfig_read_string(struct config_t *config, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_string_pre ) { - int (*preHookFunc) (config_t *config, const char *str); + int (*preHookFunc) (struct config_t *config, const char *str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func; @@ -7949,7 +7949,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) { retVal___ = HPMHooks.source.libconfig.read_string(config, str); } if( HPMHooks.count.HP_libconfig_read_string_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *str); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, str); @@ -7957,11 +7957,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) { } return retVal___; } -int HP_libconfig_read_file_src(config_t *config, const char *filename) { +int HP_libconfig_read_file_src(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_file_src_pre ) { - int (*preHookFunc) (config_t *config, const char *filename); + int (*preHookFunc) (struct config_t *config, const char *filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func; @@ -7976,7 +7976,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) { retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename); } if( HPMHooks.count.HP_libconfig_read_file_src_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *filename); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filename); @@ -7984,11 +7984,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) { } return retVal___; } -int HP_libconfig_write_file(config_t *config, const char *filename) { +int HP_libconfig_write_file(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_write_file_pre ) { - int (*preHookFunc) (config_t *config, const char *filename); + int (*preHookFunc) (struct config_t *config, const char *filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func; @@ -8003,7 +8003,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) { retVal___ = HPMHooks.source.libconfig.write_file(config, filename); } if( HPMHooks.count.HP_libconfig_write_file_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *filename); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filename); @@ -8011,10 +8011,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) { } return retVal___; } -void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) { +void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_destructor_pre ) { - void (*preHookFunc) (config_t *config, void ( *destructor ) (void *)); + void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func; @@ -8029,7 +8029,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *) HPMHooks.source.libconfig.set_destructor(config, destructor); } if( HPMHooks.count.HP_libconfig_set_destructor_post ) { - void (*postHookFunc) (config_t *config, void ( *destructor ) (void *)); + void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *)); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func; postHookFunc(config, destructor); @@ -8037,10 +8037,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *) } return; } -void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { +void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) { - void (*preHookFunc) (config_t *config, const char *include_dir); + void (*preHookFunc) (struct config_t *config, const char *include_dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func; @@ -8055,7 +8055,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { HPMHooks.source.libconfig.set_include_dir(config, include_dir); } if( HPMHooks.count.HP_libconfig_set_include_dir_post ) { - void (*postHookFunc) (config_t *config, const char *include_dir); + void (*postHookFunc) (struct config_t *config, const char *include_dir); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func; postHookFunc(config, include_dir); @@ -8063,10 +8063,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { } return; } -void HP_libconfig_init(config_t *config) { +void HP_libconfig_init(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_init_pre ) { - void (*preHookFunc) (config_t *config); + void (*preHookFunc) (struct config_t *config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func; @@ -8081,7 +8081,7 @@ void HP_libconfig_init(config_t *config) { HPMHooks.source.libconfig.init(config); } if( HPMHooks.count.HP_libconfig_init_post ) { - void (*postHookFunc) (config_t *config); + void (*postHookFunc) (struct config_t *config); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func; postHookFunc(config); @@ -8089,10 +8089,10 @@ void HP_libconfig_init(config_t *config) { } return; } -void HP_libconfig_destroy(config_t *config) { +void HP_libconfig_destroy(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_destroy_pre ) { - void (*preHookFunc) (config_t *config); + void (*preHookFunc) (struct config_t *config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func; @@ -8107,7 +8107,7 @@ void HP_libconfig_destroy(config_t *config) { HPMHooks.source.libconfig.destroy(config); } if( HPMHooks.count.HP_libconfig_destroy_post ) { - void (*postHookFunc) (config_t *config); + void (*postHookFunc) (struct config_t *config); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func; postHookFunc(config); @@ -8115,11 +8115,11 @@ void HP_libconfig_destroy(config_t *config) { } return; } -int HP_libconfig_setting_get_int(const config_setting_t *setting) { +int HP_libconfig_setting_get_int(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func; @@ -8134,7 +8134,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_int(setting); } if( HPMHooks.count.HP_libconfig_setting_get_int_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8142,11 +8142,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) { } return retVal___; } -long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { +long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) { int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) { - long long (*preHookFunc) (const config_setting_t *setting); + long long (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func; @@ -8161,7 +8161,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting); } if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) { - long long (*postHookFunc) (long long retVal___, const config_setting_t *setting); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8169,11 +8169,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { } return retVal___; } -double HP_libconfig_setting_get_float(const config_setting_t *setting) { +double HP_libconfig_setting_get_float(const struct config_setting_t *setting) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) { - double (*preHookFunc) (const config_setting_t *setting); + double (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func; @@ -8188,7 +8188,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_float(setting); } if( HPMHooks.count.HP_libconfig_setting_get_float_post ) { - double (*postHookFunc) (double retVal___, const config_setting_t *setting); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8196,11 +8196,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_get_bool(const config_setting_t *setting) { +int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func; @@ -8215,7 +8215,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting); } if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8223,11 +8223,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { +const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) { - const char* (*preHookFunc) (const config_setting_t *setting); + const char* (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -8242,7 +8242,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if( HPMHooks.count.HP_libconfig_setting_get_string_post ) { - const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8250,11 +8250,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) { +struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { + int hIndex = 0; + struct config_setting_t* retVal___ = NULL; + if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) { + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; + retVal___ = preHookFunc(setting, name); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_post ) { + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func; @@ -8269,7 +8296,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -8277,11 +8304,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char } return retVal___; } -int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) { +int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func; @@ -8296,7 +8323,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -8304,11 +8331,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha } return retVal___; } -int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) { +int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func; @@ -8323,7 +8350,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -8331,11 +8358,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha } return retVal___; } -int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) { +int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func; @@ -8350,7 +8377,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -8358,11 +8385,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char } return retVal___; } -int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) { +int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func; @@ -8377,7 +8404,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -8385,11 +8412,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch } return retVal___; } -int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { +int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) { - int (*preHookFunc) (config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t *setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func; @@ -8404,7 +8431,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -8412,11 +8439,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { } return retVal___; } -int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { +int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) { - int (*preHookFunc) (config_setting_t *setting, long long *value); + int (*preHookFunc) (struct config_setting_t *setting, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func; @@ -8431,7 +8458,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -8439,11 +8466,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { } return retVal___; } -int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { +int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) { - int (*preHookFunc) (config_setting_t *setting, double *value); + int (*preHookFunc) (struct config_setting_t *setting, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func; @@ -8458,7 +8485,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -8466,11 +8493,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { } return retVal___; } -int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { +int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) { - int (*preHookFunc) (config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t *setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func; @@ -8485,7 +8512,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -8493,11 +8520,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { } return retVal___; } -int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) { +int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) { - int (*preHookFunc) (config_setting_t *setting, const char *value); + int (*preHookFunc) (struct config_setting_t *setting, const char *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func; @@ -8512,7 +8539,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, value); @@ -8520,11 +8547,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value } return retVal___; } -int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { +int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) { - int (*preHookFunc) (config_setting_t *setting, short *format); + int (*preHookFunc) (struct config_setting_t *setting, short *format); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func; @@ -8539,7 +8566,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format); } if( HPMHooks.count.HP_libconfig_setting_set_format_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &format); @@ -8547,11 +8574,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { } return retVal___; } -short HP_libconfig_setting_get_format(const config_setting_t *setting) { +short HP_libconfig_setting_get_format(const struct config_setting_t *setting) { int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) { - short (*preHookFunc) (const config_setting_t *setting); + short (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func; @@ -8566,7 +8593,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_format(setting); } if( HPMHooks.count.HP_libconfig_setting_get_format_post ) { - short (*postHookFunc) (short retVal___, const config_setting_t *setting); + short (*postHookFunc) (short retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8574,11 +8601,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) { +int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) { - int (*preHookFunc) (const config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func; @@ -8593,7 +8620,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -8601,11 +8628,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) } return retVal___; } -long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) { +long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) { - long long (*preHookFunc) (const config_setting_t *setting, int *idx); + long long (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func; @@ -8620,7 +8647,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) { - long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -8628,11 +8655,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i } return retVal___; } -double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) { +double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) { - double (*preHookFunc) (const config_setting_t *setting, int *idx); + double (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func; @@ -8647,7 +8674,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) { - double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -8655,11 +8682,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int } return retVal___; } -int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) { +int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) { - int (*preHookFunc) (const config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func; @@ -8674,7 +8701,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -8682,11 +8709,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) { +const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) { - const char* (*preHookFunc) (const config_setting_t *setting, int *idx); + const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -8701,7 +8728,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) { - const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -8709,11 +8736,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting } return retVal___; } -config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) { +struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -8728,7 +8755,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -8736,11 +8763,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i } return retVal___; } -config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) { +struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -8755,7 +8782,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -8763,11 +8790,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) { +struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -8782,7 +8809,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -8790,11 +8817,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) { +struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -8809,7 +8836,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -8817,11 +8844,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) { +struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -8836,7 +8863,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, value); @@ -8844,11 +8871,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting } return retVal___; } -int HP_libconfig_setting_index(const config_setting_t *setting) { +int HP_libconfig_setting_index(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_index_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func; @@ -8863,7 +8890,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_index(setting); } if( HPMHooks.count.HP_libconfig_setting_index_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8871,11 +8898,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_length(const config_setting_t *setting) { +int HP_libconfig_setting_length(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_length_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func; @@ -8890,7 +8917,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_length(setting); } if( HPMHooks.count.HP_libconfig_setting_length_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -8898,11 +8925,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) { } return retVal___; } -config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) { +struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) { - config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -8917,7 +8944,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -8925,11 +8952,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) { +struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) { - config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -8944,7 +8971,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if( HPMHooks.count.HP_libconfig_setting_get_member_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -8952,11 +8979,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin } return retVal___; } -config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) { +struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_add_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -8971,7 +8998,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if( HPMHooks.count.HP_libconfig_setting_add_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, &type); @@ -8979,11 +9006,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char } return retVal___; } -int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { +int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_pre ) { - int (*preHookFunc) (config_setting_t *parent, const char *name); + int (*preHookFunc) (struct config_setting_t *parent, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func; @@ -8998,7 +9025,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name); } if( HPMHooks.count.HP_libconfig_setting_remove_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -9006,11 +9033,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { } return retVal___; } -int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) { +int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) { - int (*preHookFunc) (config_setting_t *parent, unsigned int *idx); + int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func; @@ -9025,7 +9052,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx); } if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, &idx); @@ -9033,10 +9060,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) } return retVal___; } -void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { +void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) { - void (*preHookFunc) (config_setting_t *setting, void *hook); + void (*preHookFunc) (struct config_setting_t *setting, void *hook); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func; @@ -9051,7 +9078,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { HPMHooks.source.libconfig.setting_set_hook(setting, hook); } if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) { - void (*postHookFunc) (config_setting_t *setting, void *hook); + void (*postHookFunc) (struct config_setting_t *setting, void *hook); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func; postHookFunc(setting, hook); @@ -9059,11 +9086,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { } return; } -config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) { +struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_lookup_pre ) { - config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath); + struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -9078,7 +9105,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if( HPMHooks.count.HP_libconfig_lookup_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -9086,38 +9113,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa } return retVal___; } -config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) { - int hIndex = 0; - config_setting_t* retVal___ = NULL; - if( HPMHooks.count.HP_libconfig_lookup_from_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func; - retVal___ = preHookFunc(setting, filepath); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath); - } - if( HPMHooks.count.HP_libconfig_lookup_from_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, filepath); - } - } - return retVal___; -} -int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) { +int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func; @@ -9132,7 +9132,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_int_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -9140,11 +9140,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v } return retVal___; } -int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) { +int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, long long *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func; @@ -9159,7 +9159,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_int64_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -9167,11 +9167,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long } return retVal___; } -int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) { +int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_float_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, double *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func; @@ -9186,7 +9186,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_float_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -9194,11 +9194,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub } return retVal___; } -int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) { +int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func; @@ -9213,7 +9213,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int * retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_bool_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -9221,11 +9221,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int * } return retVal___; } -int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) { +int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_string_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, const char **value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func; @@ -9240,7 +9240,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_string_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -9248,14 +9248,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con } return retVal___; } -int HP_libconfig_read_file(config_t *config, const char *config_filename) { +int HP_libconfig_load_file(struct config_t *config, const char *config_filename) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_libconfig_read_file_pre ) { - int (*preHookFunc) (config_t *config, const char *config_filename); + if( HPMHooks.count.HP_libconfig_load_file_pre ) { + int (*preHookFunc) (struct config_t *config, const char *config_filename); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func; retVal___ = preHookFunc(config, config_filename); } if( *HPMforce_return ) { @@ -9264,21 +9264,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) { } } { - retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename); + retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename); } - if( HPMHooks.count.HP_libconfig_read_file_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func; + if( HPMHooks.count.HP_libconfig_load_file_post ) { + int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, config_filename); } } return retVal___; } -void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func; @@ -9293,7 +9293,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set HPMHooks.source.libconfig.setting_copy_simple(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func; postHookFunc(parent, src); @@ -9301,10 +9301,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set } return; } -void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func; @@ -9319,7 +9319,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti HPMHooks.source.libconfig.setting_copy_elem(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func; postHookFunc(parent, src); @@ -9327,10 +9327,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti } return; } -void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func; @@ -9345,7 +9345,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_ HPMHooks.source.libconfig.setting_copy_aggregate(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func; postHookFunc(parent, src); @@ -9353,11 +9353,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_ } return; } -int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) { +int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_copy_pre ) { - int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func; @@ -9372,7 +9372,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, src); @@ -9380,6 +9380,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t * } return retVal___; } +bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) { + bool (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) { + bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) { + int hIndex = 0; + uint32 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) { + uint32 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) { + uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) { + int hIndex = 0; + uint16 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) { + uint16 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) { + uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) { + int hIndex = 0; + int16 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) { + int16 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) { + int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, out, &out_size); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, out, &out_size); + } + } + return retVal___; +} +int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) { + int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func; + retVal___ = preHookFunc(config, name, out, &out_size); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size); + } + if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) { + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func; + retVal___ = postHookFunc(retVal___, config, name, out, &out_size); + } + } + return retVal___; +} /* loginif */ void HP_loginif_init(void) { int hIndex = 0; @@ -15820,11 +16090,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) { } return retVal___; } -int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { +int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) { - int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func; @@ -15839,7 +16109,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname); } if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, t, list, filename, groupname); diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc index a9abae542..c8d9d7e0d 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc @@ -94,10 +94,10 @@ struct { struct HPMHookPoint *HP_libconfig_read_post; struct HPMHookPoint *HP_libconfig_write_pre; struct HPMHookPoint *HP_libconfig_write_post; - struct HPMHookPoint *HP_libconfig_set_auto_convert_pre; - struct HPMHookPoint *HP_libconfig_set_auto_convert_post; - struct HPMHookPoint *HP_libconfig_get_auto_convert_pre; - struct HPMHookPoint *HP_libconfig_get_auto_convert_post; + struct HPMHookPoint *HP_libconfig_set_options_pre; + struct HPMHookPoint *HP_libconfig_set_options_post; + struct HPMHookPoint *HP_libconfig_get_options_pre; + struct HPMHookPoint *HP_libconfig_get_options_post; struct HPMHookPoint *HP_libconfig_read_string_pre; struct HPMHookPoint *HP_libconfig_read_string_post; struct HPMHookPoint *HP_libconfig_read_file_src_pre; @@ -122,6 +122,8 @@ struct { struct HPMHookPoint *HP_libconfig_setting_get_bool_post; struct HPMHookPoint *HP_libconfig_setting_get_string_pre; struct HPMHookPoint *HP_libconfig_setting_get_string_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_post; struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre; struct HPMHookPoint *HP_libconfig_setting_lookup_int_post; struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre; @@ -184,8 +186,6 @@ struct { struct HPMHookPoint *HP_libconfig_setting_set_hook_post; struct HPMHookPoint *HP_libconfig_lookup_pre; struct HPMHookPoint *HP_libconfig_lookup_post; - struct HPMHookPoint *HP_libconfig_lookup_from_pre; - struct HPMHookPoint *HP_libconfig_lookup_from_post; struct HPMHookPoint *HP_libconfig_lookup_int_pre; struct HPMHookPoint *HP_libconfig_lookup_int_post; struct HPMHookPoint *HP_libconfig_lookup_int64_pre; @@ -196,8 +196,8 @@ struct { struct HPMHookPoint *HP_libconfig_lookup_bool_post; struct HPMHookPoint *HP_libconfig_lookup_string_pre; struct HPMHookPoint *HP_libconfig_lookup_string_post; - struct HPMHookPoint *HP_libconfig_read_file_pre; - struct HPMHookPoint *HP_libconfig_read_file_post; + struct HPMHookPoint *HP_libconfig_load_file_pre; + struct HPMHookPoint *HP_libconfig_load_file_post; struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre; struct HPMHookPoint *HP_libconfig_setting_copy_simple_post; struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre; @@ -206,6 +206,26 @@ struct { struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post; struct HPMHookPoint *HP_libconfig_setting_copy_pre; struct HPMHookPoint *HP_libconfig_setting_copy_post; + struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre; + struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post; + struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre; + struct HPMHookPoint *HP_libconfig_setting_get_uint32_post; + struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre; + struct HPMHookPoint *HP_libconfig_setting_get_uint16_post; + struct HPMHookPoint *HP_libconfig_setting_get_int16_pre; + struct HPMHookPoint *HP_libconfig_setting_get_int16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post; + struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre; + struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post; struct HPMHookPoint *HP_login_mmo_auth_pre; struct HPMHookPoint *HP_login_mmo_auth_post; struct HPMHookPoint *HP_login_mmo_auth_new_pre; @@ -673,10 +693,10 @@ struct { int HP_libconfig_read_post; int HP_libconfig_write_pre; int HP_libconfig_write_post; - int HP_libconfig_set_auto_convert_pre; - int HP_libconfig_set_auto_convert_post; - int HP_libconfig_get_auto_convert_pre; - int HP_libconfig_get_auto_convert_post; + int HP_libconfig_set_options_pre; + int HP_libconfig_set_options_post; + int HP_libconfig_get_options_pre; + int HP_libconfig_get_options_post; int HP_libconfig_read_string_pre; int HP_libconfig_read_string_post; int HP_libconfig_read_file_src_pre; @@ -701,6 +721,8 @@ struct { int HP_libconfig_setting_get_bool_post; int HP_libconfig_setting_get_string_pre; int HP_libconfig_setting_get_string_post; + int HP_libconfig_setting_lookup_pre; + int HP_libconfig_setting_lookup_post; int HP_libconfig_setting_lookup_int_pre; int HP_libconfig_setting_lookup_int_post; int HP_libconfig_setting_lookup_int64_pre; @@ -763,8 +785,6 @@ struct { int HP_libconfig_setting_set_hook_post; int HP_libconfig_lookup_pre; int HP_libconfig_lookup_post; - int HP_libconfig_lookup_from_pre; - int HP_libconfig_lookup_from_post; int HP_libconfig_lookup_int_pre; int HP_libconfig_lookup_int_post; int HP_libconfig_lookup_int64_pre; @@ -775,8 +795,8 @@ struct { int HP_libconfig_lookup_bool_post; int HP_libconfig_lookup_string_pre; int HP_libconfig_lookup_string_post; - int HP_libconfig_read_file_pre; - int HP_libconfig_read_file_post; + int HP_libconfig_load_file_pre; + int HP_libconfig_load_file_post; int HP_libconfig_setting_copy_simple_pre; int HP_libconfig_setting_copy_simple_post; int HP_libconfig_setting_copy_elem_pre; @@ -785,6 +805,26 @@ struct { int HP_libconfig_setting_copy_aggregate_post; int HP_libconfig_setting_copy_pre; int HP_libconfig_setting_copy_post; + int HP_libconfig_setting_get_bool_real_pre; + int HP_libconfig_setting_get_bool_real_post; + int HP_libconfig_setting_get_uint32_pre; + int HP_libconfig_setting_get_uint32_post; + int HP_libconfig_setting_get_uint16_pre; + int HP_libconfig_setting_get_uint16_post; + int HP_libconfig_setting_get_int16_pre; + int HP_libconfig_setting_get_int16_post; + int HP_libconfig_setting_lookup_bool_real_pre; + int HP_libconfig_setting_lookup_bool_real_post; + int HP_libconfig_setting_lookup_uint32_pre; + int HP_libconfig_setting_lookup_uint32_post; + int HP_libconfig_setting_lookup_uint16_pre; + int HP_libconfig_setting_lookup_uint16_post; + int HP_libconfig_setting_lookup_int16_pre; + int HP_libconfig_setting_lookup_int16_post; + int HP_libconfig_setting_lookup_mutable_string_pre; + int HP_libconfig_setting_lookup_mutable_string_post; + int HP_libconfig_lookup_mutable_string_pre; + int HP_libconfig_lookup_mutable_string_post; int HP_login_mmo_auth_pre; int HP_login_mmo_auth_post; int HP_login_mmo_auth_new_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc index 5e501c62c..7a02e799c 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc @@ -64,8 +64,8 @@ struct HookingPointData HookingPoints[] = { /* libconfig */ { HP_POP(libconfig->read, HP_libconfig_read) }, { HP_POP(libconfig->write, HP_libconfig_write) }, - { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) }, - { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) }, + { HP_POP(libconfig->set_options, HP_libconfig_set_options) }, + { HP_POP(libconfig->get_options, HP_libconfig_get_options) }, { HP_POP(libconfig->read_string, HP_libconfig_read_string) }, { HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) }, { HP_POP(libconfig->write_file, HP_libconfig_write_file) }, @@ -78,6 +78,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) }, { HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) }, { HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) }, + { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) }, { HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) }, { HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) }, { HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) }, @@ -109,17 +110,26 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) }, { HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) }, { HP_POP(libconfig->lookup, HP_libconfig_lookup) }, - { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) }, { HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) }, { HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) }, { HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) }, { HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) }, { HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) }, - { HP_POP(libconfig->read_file, HP_libconfig_read_file) }, + { HP_POP(libconfig->load_file, HP_libconfig_load_file) }, { HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) }, { HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) }, { HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) }, { HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) }, + { HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) }, + { HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) }, + { HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) }, + { HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) }, + { HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) }, + { HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) }, + { HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) }, + { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) }, + { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) }, + { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) }, /* login */ { HP_POP(login->mmo_auth, HP_login_mmo_auth) }, { HP_POP(login->mmo_auth_new, HP_login_mmo_auth_new) }, diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc index bf0610688..5bbc8fefb 100644 --- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc @@ -918,11 +918,11 @@ void HP_DB_final(void) { return; } /* libconfig */ -int HP_libconfig_read(config_t *config, FILE *stream) { +int HP_libconfig_read(struct config_t *config, FILE *stream) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_pre ) { - int (*preHookFunc) (config_t *config, FILE *stream); + int (*preHookFunc) (struct config_t *config, FILE *stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func; @@ -937,7 +937,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) { retVal___ = HPMHooks.source.libconfig.read(config, stream); } if( HPMHooks.count.HP_libconfig_read_post ) { - int (*postHookFunc) (int retVal___, config_t *config, FILE *stream); + int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, stream); @@ -945,10 +945,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) { } return retVal___; } -void HP_libconfig_write(const config_t *config, FILE *stream) { +void HP_libconfig_write(const struct config_t *config, FILE *stream) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_write_pre ) { - void (*preHookFunc) (const config_t *config, FILE *stream); + void (*preHookFunc) (const struct config_t *config, FILE *stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func; @@ -963,7 +963,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) { HPMHooks.source.libconfig.write(config, stream); } if( HPMHooks.count.HP_libconfig_write_post ) { - void (*postHookFunc) (const config_t *config, FILE *stream); + void (*postHookFunc) (const struct config_t *config, FILE *stream); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func; postHookFunc(config, stream); @@ -971,14 +971,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) { } return; } -void HP_libconfig_set_auto_convert(config_t *config, int flag) { +void HP_libconfig_set_options(struct config_t *config, int options) { int hIndex = 0; - if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) { - void (*preHookFunc) (config_t *config, int *flag); + if( HPMHooks.count.HP_libconfig_set_options_pre ) { + void (*preHookFunc) (struct config_t *config, int *options); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func; - preHookFunc(config, &flag); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func; + preHookFunc(config, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -986,25 +986,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) { } } { - HPMHooks.source.libconfig.set_auto_convert(config, flag); + HPMHooks.source.libconfig.set_options(config, options); } - if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) { - void (*postHookFunc) (config_t *config, int *flag); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func; - postHookFunc(config, &flag); + if( HPMHooks.count.HP_libconfig_set_options_post ) { + void (*postHookFunc) (struct config_t *config, int *options); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func; + postHookFunc(config, &options); } } return; } -int HP_libconfig_get_auto_convert(const config_t *config) { +int HP_libconfig_get_options(const struct config_t *config) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) { - int (*preHookFunc) (const config_t *config); + if( HPMHooks.count.HP_libconfig_get_options_pre ) { + int (*preHookFunc) (const struct config_t *config); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func; retVal___ = preHookFunc(config); } if( *HPMforce_return ) { @@ -1013,22 +1013,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) { } } { - retVal___ = HPMHooks.source.libconfig.get_auto_convert(config); + retVal___ = HPMHooks.source.libconfig.get_options(config); } - if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) { - int (*postHookFunc) (int retVal___, const config_t *config); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func; + if( HPMHooks.count.HP_libconfig_get_options_post ) { + int (*postHookFunc) (int retVal___, const struct config_t *config); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func; retVal___ = postHookFunc(retVal___, config); } } return retVal___; } -int HP_libconfig_read_string(config_t *config, const char *str) { +int HP_libconfig_read_string(struct config_t *config, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_string_pre ) { - int (*preHookFunc) (config_t *config, const char *str); + int (*preHookFunc) (struct config_t *config, const char *str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func; @@ -1043,7 +1043,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) { retVal___ = HPMHooks.source.libconfig.read_string(config, str); } if( HPMHooks.count.HP_libconfig_read_string_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *str); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, str); @@ -1051,11 +1051,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) { } return retVal___; } -int HP_libconfig_read_file_src(config_t *config, const char *filename) { +int HP_libconfig_read_file_src(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_file_src_pre ) { - int (*preHookFunc) (config_t *config, const char *filename); + int (*preHookFunc) (struct config_t *config, const char *filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func; @@ -1070,7 +1070,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) { retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename); } if( HPMHooks.count.HP_libconfig_read_file_src_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *filename); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filename); @@ -1078,11 +1078,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) { } return retVal___; } -int HP_libconfig_write_file(config_t *config, const char *filename) { +int HP_libconfig_write_file(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_write_file_pre ) { - int (*preHookFunc) (config_t *config, const char *filename); + int (*preHookFunc) (struct config_t *config, const char *filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func; @@ -1097,7 +1097,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) { retVal___ = HPMHooks.source.libconfig.write_file(config, filename); } if( HPMHooks.count.HP_libconfig_write_file_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *filename); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filename); @@ -1105,10 +1105,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) { } return retVal___; } -void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) { +void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_destructor_pre ) { - void (*preHookFunc) (config_t *config, void ( *destructor ) (void *)); + void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func; @@ -1123,7 +1123,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *) HPMHooks.source.libconfig.set_destructor(config, destructor); } if( HPMHooks.count.HP_libconfig_set_destructor_post ) { - void (*postHookFunc) (config_t *config, void ( *destructor ) (void *)); + void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *)); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func; postHookFunc(config, destructor); @@ -1131,10 +1131,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *) } return; } -void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { +void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) { - void (*preHookFunc) (config_t *config, const char *include_dir); + void (*preHookFunc) (struct config_t *config, const char *include_dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func; @@ -1149,7 +1149,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { HPMHooks.source.libconfig.set_include_dir(config, include_dir); } if( HPMHooks.count.HP_libconfig_set_include_dir_post ) { - void (*postHookFunc) (config_t *config, const char *include_dir); + void (*postHookFunc) (struct config_t *config, const char *include_dir); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func; postHookFunc(config, include_dir); @@ -1157,10 +1157,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { } return; } -void HP_libconfig_init(config_t *config) { +void HP_libconfig_init(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_init_pre ) { - void (*preHookFunc) (config_t *config); + void (*preHookFunc) (struct config_t *config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func; @@ -1175,7 +1175,7 @@ void HP_libconfig_init(config_t *config) { HPMHooks.source.libconfig.init(config); } if( HPMHooks.count.HP_libconfig_init_post ) { - void (*postHookFunc) (config_t *config); + void (*postHookFunc) (struct config_t *config); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func; postHookFunc(config); @@ -1183,10 +1183,10 @@ void HP_libconfig_init(config_t *config) { } return; } -void HP_libconfig_destroy(config_t *config) { +void HP_libconfig_destroy(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_destroy_pre ) { - void (*preHookFunc) (config_t *config); + void (*preHookFunc) (struct config_t *config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func; @@ -1201,7 +1201,7 @@ void HP_libconfig_destroy(config_t *config) { HPMHooks.source.libconfig.destroy(config); } if( HPMHooks.count.HP_libconfig_destroy_post ) { - void (*postHookFunc) (config_t *config); + void (*postHookFunc) (struct config_t *config); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func; postHookFunc(config); @@ -1209,11 +1209,11 @@ void HP_libconfig_destroy(config_t *config) { } return; } -int HP_libconfig_setting_get_int(const config_setting_t *setting) { +int HP_libconfig_setting_get_int(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func; @@ -1228,7 +1228,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_int(setting); } if( HPMHooks.count.HP_libconfig_setting_get_int_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1236,11 +1236,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) { } return retVal___; } -long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { +long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) { int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) { - long long (*preHookFunc) (const config_setting_t *setting); + long long (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func; @@ -1255,7 +1255,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting); } if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) { - long long (*postHookFunc) (long long retVal___, const config_setting_t *setting); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1263,11 +1263,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { } return retVal___; } -double HP_libconfig_setting_get_float(const config_setting_t *setting) { +double HP_libconfig_setting_get_float(const struct config_setting_t *setting) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) { - double (*preHookFunc) (const config_setting_t *setting); + double (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func; @@ -1282,7 +1282,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_float(setting); } if( HPMHooks.count.HP_libconfig_setting_get_float_post ) { - double (*postHookFunc) (double retVal___, const config_setting_t *setting); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1290,11 +1290,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_get_bool(const config_setting_t *setting) { +int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func; @@ -1309,7 +1309,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting); } if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1317,11 +1317,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { +const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) { - const char* (*preHookFunc) (const config_setting_t *setting); + const char* (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -1336,7 +1336,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if( HPMHooks.count.HP_libconfig_setting_get_string_post ) { - const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1344,11 +1344,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) { +struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { + int hIndex = 0; + struct config_setting_t* retVal___ = NULL; + if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) { + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; + retVal___ = preHookFunc(setting, name); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_post ) { + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func; @@ -1363,7 +1390,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -1371,11 +1398,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char } return retVal___; } -int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) { +int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func; @@ -1390,7 +1417,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -1398,11 +1425,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha } return retVal___; } -int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) { +int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func; @@ -1417,7 +1444,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -1425,11 +1452,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha } return retVal___; } -int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) { +int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func; @@ -1444,7 +1471,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -1452,11 +1479,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char } return retVal___; } -int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) { +int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func; @@ -1471,7 +1498,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -1479,11 +1506,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch } return retVal___; } -int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { +int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) { - int (*preHookFunc) (config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t *setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func; @@ -1498,7 +1525,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -1506,11 +1533,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { } return retVal___; } -int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { +int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) { - int (*preHookFunc) (config_setting_t *setting, long long *value); + int (*preHookFunc) (struct config_setting_t *setting, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func; @@ -1525,7 +1552,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -1533,11 +1560,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { } return retVal___; } -int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { +int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) { - int (*preHookFunc) (config_setting_t *setting, double *value); + int (*preHookFunc) (struct config_setting_t *setting, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func; @@ -1552,7 +1579,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -1560,11 +1587,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { } return retVal___; } -int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { +int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) { - int (*preHookFunc) (config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t *setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func; @@ -1579,7 +1606,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -1587,11 +1614,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { } return retVal___; } -int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) { +int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) { - int (*preHookFunc) (config_setting_t *setting, const char *value); + int (*preHookFunc) (struct config_setting_t *setting, const char *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func; @@ -1606,7 +1633,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, value); @@ -1614,11 +1641,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value } return retVal___; } -int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { +int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) { - int (*preHookFunc) (config_setting_t *setting, short *format); + int (*preHookFunc) (struct config_setting_t *setting, short *format); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func; @@ -1633,7 +1660,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format); } if( HPMHooks.count.HP_libconfig_setting_set_format_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &format); @@ -1641,11 +1668,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { } return retVal___; } -short HP_libconfig_setting_get_format(const config_setting_t *setting) { +short HP_libconfig_setting_get_format(const struct config_setting_t *setting) { int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) { - short (*preHookFunc) (const config_setting_t *setting); + short (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func; @@ -1660,7 +1687,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_format(setting); } if( HPMHooks.count.HP_libconfig_setting_get_format_post ) { - short (*postHookFunc) (short retVal___, const config_setting_t *setting); + short (*postHookFunc) (short retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1668,11 +1695,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) { +int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) { - int (*preHookFunc) (const config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func; @@ -1687,7 +1714,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -1695,11 +1722,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) } return retVal___; } -long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) { +long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) { - long long (*preHookFunc) (const config_setting_t *setting, int *idx); + long long (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func; @@ -1714,7 +1741,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) { - long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -1722,11 +1749,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i } return retVal___; } -double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) { +double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) { - double (*preHookFunc) (const config_setting_t *setting, int *idx); + double (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func; @@ -1741,7 +1768,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) { - double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -1749,11 +1776,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int } return retVal___; } -int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) { +int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) { - int (*preHookFunc) (const config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func; @@ -1768,7 +1795,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -1776,11 +1803,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) { +const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) { - const char* (*preHookFunc) (const config_setting_t *setting, int *idx); + const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -1795,7 +1822,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) { - const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -1803,11 +1830,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting } return retVal___; } -config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) { +struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -1822,7 +1849,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -1830,11 +1857,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i } return retVal___; } -config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) { +struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -1849,7 +1876,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -1857,11 +1884,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) { +struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -1876,7 +1903,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -1884,11 +1911,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) { +struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -1903,7 +1930,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -1911,11 +1938,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) { +struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -1930,7 +1957,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, value); @@ -1938,11 +1965,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting } return retVal___; } -int HP_libconfig_setting_index(const config_setting_t *setting) { +int HP_libconfig_setting_index(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_index_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func; @@ -1957,7 +1984,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_index(setting); } if( HPMHooks.count.HP_libconfig_setting_index_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1965,11 +1992,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_length(const config_setting_t *setting) { +int HP_libconfig_setting_length(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_length_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func; @@ -1984,7 +2011,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_length(setting); } if( HPMHooks.count.HP_libconfig_setting_length_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -1992,11 +2019,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) { } return retVal___; } -config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) { +struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) { - config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -2011,7 +2038,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -2019,11 +2046,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) { +struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) { - config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -2038,7 +2065,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if( HPMHooks.count.HP_libconfig_setting_get_member_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -2046,11 +2073,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin } return retVal___; } -config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) { +struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_add_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -2065,7 +2092,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if( HPMHooks.count.HP_libconfig_setting_add_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, &type); @@ -2073,11 +2100,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char } return retVal___; } -int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { +int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_pre ) { - int (*preHookFunc) (config_setting_t *parent, const char *name); + int (*preHookFunc) (struct config_setting_t *parent, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func; @@ -2092,7 +2119,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name); } if( HPMHooks.count.HP_libconfig_setting_remove_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -2100,11 +2127,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { } return retVal___; } -int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) { +int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) { - int (*preHookFunc) (config_setting_t *parent, unsigned int *idx); + int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func; @@ -2119,7 +2146,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx); } if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, &idx); @@ -2127,10 +2154,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) } return retVal___; } -void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { +void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) { - void (*preHookFunc) (config_setting_t *setting, void *hook); + void (*preHookFunc) (struct config_setting_t *setting, void *hook); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func; @@ -2145,7 +2172,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { HPMHooks.source.libconfig.setting_set_hook(setting, hook); } if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) { - void (*postHookFunc) (config_setting_t *setting, void *hook); + void (*postHookFunc) (struct config_setting_t *setting, void *hook); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func; postHookFunc(setting, hook); @@ -2153,11 +2180,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { } return; } -config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) { +struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_lookup_pre ) { - config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath); + struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -2172,7 +2199,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if( HPMHooks.count.HP_libconfig_lookup_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -2180,38 +2207,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa } return retVal___; } -config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) { - int hIndex = 0; - config_setting_t* retVal___ = NULL; - if( HPMHooks.count.HP_libconfig_lookup_from_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func; - retVal___ = preHookFunc(setting, filepath); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath); - } - if( HPMHooks.count.HP_libconfig_lookup_from_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, filepath); - } - } - return retVal___; -} -int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) { +int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func; @@ -2226,7 +2226,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_int_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -2234,11 +2234,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v } return retVal___; } -int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) { +int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, long long *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func; @@ -2253,7 +2253,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_int64_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -2261,11 +2261,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long } return retVal___; } -int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) { +int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_float_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, double *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func; @@ -2280,7 +2280,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_float_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -2288,11 +2288,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub } return retVal___; } -int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) { +int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func; @@ -2307,7 +2307,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int * retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_bool_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -2315,11 +2315,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int * } return retVal___; } -int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) { +int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_string_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, const char **value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func; @@ -2334,7 +2334,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_string_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -2342,14 +2342,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con } return retVal___; } -int HP_libconfig_read_file(config_t *config, const char *config_filename) { +int HP_libconfig_load_file(struct config_t *config, const char *config_filename) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_libconfig_read_file_pre ) { - int (*preHookFunc) (config_t *config, const char *config_filename); + if( HPMHooks.count.HP_libconfig_load_file_pre ) { + int (*preHookFunc) (struct config_t *config, const char *config_filename); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func; retVal___ = preHookFunc(config, config_filename); } if( *HPMforce_return ) { @@ -2358,21 +2358,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) { } } { - retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename); + retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename); } - if( HPMHooks.count.HP_libconfig_read_file_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func; + if( HPMHooks.count.HP_libconfig_load_file_post ) { + int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, config_filename); } } return retVal___; } -void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func; @@ -2387,7 +2387,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set HPMHooks.source.libconfig.setting_copy_simple(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func; postHookFunc(parent, src); @@ -2395,10 +2395,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set } return; } -void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func; @@ -2413,7 +2413,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti HPMHooks.source.libconfig.setting_copy_elem(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func; postHookFunc(parent, src); @@ -2421,10 +2421,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti } return; } -void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func; @@ -2439,7 +2439,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_ HPMHooks.source.libconfig.setting_copy_aggregate(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func; postHookFunc(parent, src); @@ -2447,11 +2447,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_ } return; } -int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) { +int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_copy_pre ) { - int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func; @@ -2466,7 +2466,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, src); @@ -2474,6 +2474,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t * } return retVal___; } +bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) { + bool (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) { + bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) { + int hIndex = 0; + uint32 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) { + uint32 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) { + uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) { + int hIndex = 0; + uint16 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) { + uint16 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) { + uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) { + int hIndex = 0; + int16 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) { + int16 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) { + int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, out, &out_size); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, out, &out_size); + } + } + return retVal___; +} +int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) { + int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func; + retVal___ = preHookFunc(config, name, out, &out_size); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size); + } + if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) { + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func; + retVal___ = postHookFunc(retVal___, config, name, out, &out_size); + } + } + return retVal___; +} /* login */ int HP_login_mmo_auth(struct login_session_data *sd, bool isServer) { int hIndex = 0; @@ -5146,11 +5416,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) { } return retVal___; } -int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { +int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) { - int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func; @@ -5165,7 +5435,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname); } if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, t, list, filename, groupname); diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index 911e84586..d3210cbe7 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -2742,10 +2742,10 @@ struct { struct HPMHookPoint *HP_libconfig_read_post; struct HPMHookPoint *HP_libconfig_write_pre; struct HPMHookPoint *HP_libconfig_write_post; - struct HPMHookPoint *HP_libconfig_set_auto_convert_pre; - struct HPMHookPoint *HP_libconfig_set_auto_convert_post; - struct HPMHookPoint *HP_libconfig_get_auto_convert_pre; - struct HPMHookPoint *HP_libconfig_get_auto_convert_post; + struct HPMHookPoint *HP_libconfig_set_options_pre; + struct HPMHookPoint *HP_libconfig_set_options_post; + struct HPMHookPoint *HP_libconfig_get_options_pre; + struct HPMHookPoint *HP_libconfig_get_options_post; struct HPMHookPoint *HP_libconfig_read_string_pre; struct HPMHookPoint *HP_libconfig_read_string_post; struct HPMHookPoint *HP_libconfig_read_file_src_pre; @@ -2770,6 +2770,8 @@ struct { struct HPMHookPoint *HP_libconfig_setting_get_bool_post; struct HPMHookPoint *HP_libconfig_setting_get_string_pre; struct HPMHookPoint *HP_libconfig_setting_get_string_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_post; struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre; struct HPMHookPoint *HP_libconfig_setting_lookup_int_post; struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre; @@ -2832,8 +2834,6 @@ struct { struct HPMHookPoint *HP_libconfig_setting_set_hook_post; struct HPMHookPoint *HP_libconfig_lookup_pre; struct HPMHookPoint *HP_libconfig_lookup_post; - struct HPMHookPoint *HP_libconfig_lookup_from_pre; - struct HPMHookPoint *HP_libconfig_lookup_from_post; struct HPMHookPoint *HP_libconfig_lookup_int_pre; struct HPMHookPoint *HP_libconfig_lookup_int_post; struct HPMHookPoint *HP_libconfig_lookup_int64_pre; @@ -2844,8 +2844,8 @@ struct { struct HPMHookPoint *HP_libconfig_lookup_bool_post; struct HPMHookPoint *HP_libconfig_lookup_string_pre; struct HPMHookPoint *HP_libconfig_lookup_string_post; - struct HPMHookPoint *HP_libconfig_read_file_pre; - struct HPMHookPoint *HP_libconfig_read_file_post; + struct HPMHookPoint *HP_libconfig_load_file_pre; + struct HPMHookPoint *HP_libconfig_load_file_post; struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre; struct HPMHookPoint *HP_libconfig_setting_copy_simple_post; struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre; @@ -2854,6 +2854,26 @@ struct { struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post; struct HPMHookPoint *HP_libconfig_setting_copy_pre; struct HPMHookPoint *HP_libconfig_setting_copy_post; + struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre; + struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post; + struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre; + struct HPMHookPoint *HP_libconfig_setting_get_uint32_post; + struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre; + struct HPMHookPoint *HP_libconfig_setting_get_uint16_post; + struct HPMHookPoint *HP_libconfig_setting_get_int16_pre; + struct HPMHookPoint *HP_libconfig_setting_get_int16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post; + struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre; + struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post; + struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre; + struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post; struct HPMHookPoint *HP_logs_pick_pc_pre; struct HPMHookPoint *HP_logs_pick_pc_post; struct HPMHookPoint *HP_logs_pick_mob_pre; @@ -8593,10 +8613,10 @@ struct { int HP_libconfig_read_post; int HP_libconfig_write_pre; int HP_libconfig_write_post; - int HP_libconfig_set_auto_convert_pre; - int HP_libconfig_set_auto_convert_post; - int HP_libconfig_get_auto_convert_pre; - int HP_libconfig_get_auto_convert_post; + int HP_libconfig_set_options_pre; + int HP_libconfig_set_options_post; + int HP_libconfig_get_options_pre; + int HP_libconfig_get_options_post; int HP_libconfig_read_string_pre; int HP_libconfig_read_string_post; int HP_libconfig_read_file_src_pre; @@ -8621,6 +8641,8 @@ struct { int HP_libconfig_setting_get_bool_post; int HP_libconfig_setting_get_string_pre; int HP_libconfig_setting_get_string_post; + int HP_libconfig_setting_lookup_pre; + int HP_libconfig_setting_lookup_post; int HP_libconfig_setting_lookup_int_pre; int HP_libconfig_setting_lookup_int_post; int HP_libconfig_setting_lookup_int64_pre; @@ -8683,8 +8705,6 @@ struct { int HP_libconfig_setting_set_hook_post; int HP_libconfig_lookup_pre; int HP_libconfig_lookup_post; - int HP_libconfig_lookup_from_pre; - int HP_libconfig_lookup_from_post; int HP_libconfig_lookup_int_pre; int HP_libconfig_lookup_int_post; int HP_libconfig_lookup_int64_pre; @@ -8695,8 +8715,8 @@ struct { int HP_libconfig_lookup_bool_post; int HP_libconfig_lookup_string_pre; int HP_libconfig_lookup_string_post; - int HP_libconfig_read_file_pre; - int HP_libconfig_read_file_post; + int HP_libconfig_load_file_pre; + int HP_libconfig_load_file_post; int HP_libconfig_setting_copy_simple_pre; int HP_libconfig_setting_copy_simple_post; int HP_libconfig_setting_copy_elem_pre; @@ -8705,6 +8725,26 @@ struct { int HP_libconfig_setting_copy_aggregate_post; int HP_libconfig_setting_copy_pre; int HP_libconfig_setting_copy_post; + int HP_libconfig_setting_get_bool_real_pre; + int HP_libconfig_setting_get_bool_real_post; + int HP_libconfig_setting_get_uint32_pre; + int HP_libconfig_setting_get_uint32_post; + int HP_libconfig_setting_get_uint16_pre; + int HP_libconfig_setting_get_uint16_post; + int HP_libconfig_setting_get_int16_pre; + int HP_libconfig_setting_get_int16_post; + int HP_libconfig_setting_lookup_bool_real_pre; + int HP_libconfig_setting_lookup_bool_real_post; + int HP_libconfig_setting_lookup_uint32_pre; + int HP_libconfig_setting_lookup_uint32_post; + int HP_libconfig_setting_lookup_uint16_pre; + int HP_libconfig_setting_lookup_uint16_post; + int HP_libconfig_setting_lookup_int16_pre; + int HP_libconfig_setting_lookup_int16_post; + int HP_libconfig_setting_lookup_mutable_string_pre; + int HP_libconfig_setting_lookup_mutable_string_post; + int HP_libconfig_lookup_mutable_string_pre; + int HP_libconfig_lookup_mutable_string_post; int HP_logs_pick_pc_pre; int HP_logs_pick_pc_post; int HP_logs_pick_mob_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index 303f5ed7e..4ccb217a1 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -1405,8 +1405,8 @@ struct HookingPointData HookingPoints[] = { /* libconfig */ { HP_POP(libconfig->read, HP_libconfig_read) }, { HP_POP(libconfig->write, HP_libconfig_write) }, - { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) }, - { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) }, + { HP_POP(libconfig->set_options, HP_libconfig_set_options) }, + { HP_POP(libconfig->get_options, HP_libconfig_get_options) }, { HP_POP(libconfig->read_string, HP_libconfig_read_string) }, { HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) }, { HP_POP(libconfig->write_file, HP_libconfig_write_file) }, @@ -1419,6 +1419,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) }, { HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) }, { HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) }, + { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) }, { HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) }, { HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) }, { HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) }, @@ -1450,17 +1451,26 @@ struct HookingPointData HookingPoints[] = { { HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) }, { HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) }, { HP_POP(libconfig->lookup, HP_libconfig_lookup) }, - { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) }, { HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) }, { HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) }, { HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) }, { HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) }, { HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) }, - { HP_POP(libconfig->read_file, HP_libconfig_read_file) }, + { HP_POP(libconfig->load_file, HP_libconfig_load_file) }, { HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) }, { HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) }, { HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) }, { HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) }, + { HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) }, + { HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) }, + { HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) }, + { HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) }, + { HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) }, + { HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) }, + { HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) }, + { HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) }, + { HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) }, + { HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) }, /* logs */ { HP_POP(logs->pick_pc, HP_logs_pick_pc) }, { HP_POP(logs->pick_mob, HP_logs_pick_mob) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index ee07b99cb..bc26e2f37 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -265,10 +265,10 @@ bool HP_atcommand_can_use2(struct map_session_data *sd, const char *command, AtC } return retVal___; } -void HP_atcommand_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz) { +void HP_atcommand_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz) { int hIndex = 0; if( HPMHooks.count.HP_atcommand_load_groups_pre ) { - void (*preHookFunc) (GroupSettings **groups, config_setting_t **commands_, size_t *sz); + void (*preHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_atcommand_load_groups_pre[hIndex].func; @@ -283,7 +283,7 @@ void HP_atcommand_load_groups(GroupSettings **groups, config_setting_t **command HPMHooks.source.atcommand.load_groups(groups, commands_, sz); } if( HPMHooks.count.HP_atcommand_load_groups_post ) { - void (*postHookFunc) (GroupSettings **groups, config_setting_t **commands_, size_t *sz); + void (*postHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz); for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_atcommand_load_groups_post[hIndex].func; postHookFunc(groups, commands_, &sz); @@ -35754,10 +35754,10 @@ int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source) } return retVal___; } -void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, const char *source) { +void HP_itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_readdb_additional_fields_pre ) { - void (*preHookFunc) (int *itemid, config_setting_t *it, int *n, const char *source); + void (*preHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_pre[hIndex].func; @@ -35772,7 +35772,7 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, HPMHooks.source.itemdb.readdb_additional_fields(itemid, it, n, source); } if( HPMHooks.count.HP_itemdb_readdb_additional_fields_post ) { - void (*postHookFunc) (int *itemid, config_setting_t *it, int *n, const char *source); + void (*postHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_post[hIndex].func; postHookFunc(&itemid, it, &n, source); @@ -35780,11 +35780,11 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, } return; } -int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) { +int HP_itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *source) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre ) { - int (*preHookFunc) (config_setting_t *it, int *n, const char *source); + int (*preHookFunc) (struct config_setting_t *it, int *n, const char *source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_pre[hIndex].func; @@ -35799,7 +35799,7 @@ int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *sour retVal___ = HPMHooks.source.itemdb.readdb_libconfig_sub(it, n, source); } if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *it, int *n, const char *source); + int (*postHookFunc) (int retVal___, struct config_setting_t *it, int *n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, it, &n, source); @@ -36026,11 +36026,11 @@ bool HP_itemdb_is_item_usable(struct item_data *item) { } return retVal___; } -bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *value) { +bool HP_itemdb_lookup_const(const struct config_setting_t *it, const char *name, int *value) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_itemdb_lookup_const_pre ) { - bool (*preHookFunc) (const config_setting_t *it, const char *name, int *value); + bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_lookup_const_pre[hIndex].func; @@ -36045,7 +36045,7 @@ bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *v retVal___ = HPMHooks.source.itemdb.lookup_const(it, name, value); } if( HPMHooks.count.HP_itemdb_lookup_const_post ) { - bool (*postHookFunc) (bool retVal___, const config_setting_t *it, const char *name, int *value); + bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_lookup_const_post[hIndex].func; retVal___ = postHookFunc(retVal___, it, name, value); @@ -36054,11 +36054,11 @@ bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *v return retVal___; } /* libconfig */ -int HP_libconfig_read(config_t *config, FILE *stream) { +int HP_libconfig_read(struct config_t *config, FILE *stream) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_pre ) { - int (*preHookFunc) (config_t *config, FILE *stream); + int (*preHookFunc) (struct config_t *config, FILE *stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func; @@ -36073,7 +36073,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) { retVal___ = HPMHooks.source.libconfig.read(config, stream); } if( HPMHooks.count.HP_libconfig_read_post ) { - int (*postHookFunc) (int retVal___, config_t *config, FILE *stream); + int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, stream); @@ -36081,10 +36081,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) { } return retVal___; } -void HP_libconfig_write(const config_t *config, FILE *stream) { +void HP_libconfig_write(const struct config_t *config, FILE *stream) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_write_pre ) { - void (*preHookFunc) (const config_t *config, FILE *stream); + void (*preHookFunc) (const struct config_t *config, FILE *stream); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func; @@ -36099,7 +36099,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) { HPMHooks.source.libconfig.write(config, stream); } if( HPMHooks.count.HP_libconfig_write_post ) { - void (*postHookFunc) (const config_t *config, FILE *stream); + void (*postHookFunc) (const struct config_t *config, FILE *stream); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func; postHookFunc(config, stream); @@ -36107,14 +36107,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) { } return; } -void HP_libconfig_set_auto_convert(config_t *config, int flag) { +void HP_libconfig_set_options(struct config_t *config, int options) { int hIndex = 0; - if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) { - void (*preHookFunc) (config_t *config, int *flag); + if( HPMHooks.count.HP_libconfig_set_options_pre ) { + void (*preHookFunc) (struct config_t *config, int *options); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func; - preHookFunc(config, &flag); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func; + preHookFunc(config, &options); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -36122,25 +36122,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) { } } { - HPMHooks.source.libconfig.set_auto_convert(config, flag); + HPMHooks.source.libconfig.set_options(config, options); } - if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) { - void (*postHookFunc) (config_t *config, int *flag); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func; - postHookFunc(config, &flag); + if( HPMHooks.count.HP_libconfig_set_options_post ) { + void (*postHookFunc) (struct config_t *config, int *options); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func; + postHookFunc(config, &options); } } return; } -int HP_libconfig_get_auto_convert(const config_t *config) { +int HP_libconfig_get_options(const struct config_t *config) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) { - int (*preHookFunc) (const config_t *config); + if( HPMHooks.count.HP_libconfig_get_options_pre ) { + int (*preHookFunc) (const struct config_t *config); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func; retVal___ = preHookFunc(config); } if( *HPMforce_return ) { @@ -36149,22 +36149,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) { } } { - retVal___ = HPMHooks.source.libconfig.get_auto_convert(config); + retVal___ = HPMHooks.source.libconfig.get_options(config); } - if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) { - int (*postHookFunc) (int retVal___, const config_t *config); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func; + if( HPMHooks.count.HP_libconfig_get_options_post ) { + int (*postHookFunc) (int retVal___, const struct config_t *config); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func; retVal___ = postHookFunc(retVal___, config); } } return retVal___; } -int HP_libconfig_read_string(config_t *config, const char *str) { +int HP_libconfig_read_string(struct config_t *config, const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_string_pre ) { - int (*preHookFunc) (config_t *config, const char *str); + int (*preHookFunc) (struct config_t *config, const char *str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func; @@ -36179,7 +36179,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) { retVal___ = HPMHooks.source.libconfig.read_string(config, str); } if( HPMHooks.count.HP_libconfig_read_string_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *str); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, str); @@ -36187,11 +36187,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) { } return retVal___; } -int HP_libconfig_read_file_src(config_t *config, const char *filename) { +int HP_libconfig_read_file_src(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_read_file_src_pre ) { - int (*preHookFunc) (config_t *config, const char *filename); + int (*preHookFunc) (struct config_t *config, const char *filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func; @@ -36206,7 +36206,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) { retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename); } if( HPMHooks.count.HP_libconfig_read_file_src_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *filename); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filename); @@ -36214,11 +36214,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) { } return retVal___; } -int HP_libconfig_write_file(config_t *config, const char *filename) { +int HP_libconfig_write_file(struct config_t *config, const char *filename) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_write_file_pre ) { - int (*preHookFunc) (config_t *config, const char *filename); + int (*preHookFunc) (struct config_t *config, const char *filename); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func; @@ -36233,7 +36233,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) { retVal___ = HPMHooks.source.libconfig.write_file(config, filename); } if( HPMHooks.count.HP_libconfig_write_file_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *filename); + int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filename); @@ -36241,10 +36241,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) { } return retVal___; } -void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) { +void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_destructor_pre ) { - void (*preHookFunc) (config_t *config, void ( *destructor ) (void *)); + void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *)); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func; @@ -36259,7 +36259,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *) HPMHooks.source.libconfig.set_destructor(config, destructor); } if( HPMHooks.count.HP_libconfig_set_destructor_post ) { - void (*postHookFunc) (config_t *config, void ( *destructor ) (void *)); + void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *)); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func; postHookFunc(config, destructor); @@ -36267,10 +36267,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *) } return; } -void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { +void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) { - void (*preHookFunc) (config_t *config, const char *include_dir); + void (*preHookFunc) (struct config_t *config, const char *include_dir); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func; @@ -36285,7 +36285,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { HPMHooks.source.libconfig.set_include_dir(config, include_dir); } if( HPMHooks.count.HP_libconfig_set_include_dir_post ) { - void (*postHookFunc) (config_t *config, const char *include_dir); + void (*postHookFunc) (struct config_t *config, const char *include_dir); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func; postHookFunc(config, include_dir); @@ -36293,10 +36293,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) { } return; } -void HP_libconfig_init(config_t *config) { +void HP_libconfig_init(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_init_pre ) { - void (*preHookFunc) (config_t *config); + void (*preHookFunc) (struct config_t *config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func; @@ -36311,7 +36311,7 @@ void HP_libconfig_init(config_t *config) { HPMHooks.source.libconfig.init(config); } if( HPMHooks.count.HP_libconfig_init_post ) { - void (*postHookFunc) (config_t *config); + void (*postHookFunc) (struct config_t *config); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func; postHookFunc(config); @@ -36319,10 +36319,10 @@ void HP_libconfig_init(config_t *config) { } return; } -void HP_libconfig_destroy(config_t *config) { +void HP_libconfig_destroy(struct config_t *config) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_destroy_pre ) { - void (*preHookFunc) (config_t *config); + void (*preHookFunc) (struct config_t *config); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func; @@ -36337,7 +36337,7 @@ void HP_libconfig_destroy(config_t *config) { HPMHooks.source.libconfig.destroy(config); } if( HPMHooks.count.HP_libconfig_destroy_post ) { - void (*postHookFunc) (config_t *config); + void (*postHookFunc) (struct config_t *config); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func; postHookFunc(config); @@ -36345,11 +36345,11 @@ void HP_libconfig_destroy(config_t *config) { } return; } -int HP_libconfig_setting_get_int(const config_setting_t *setting) { +int HP_libconfig_setting_get_int(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func; @@ -36364,7 +36364,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_int(setting); } if( HPMHooks.count.HP_libconfig_setting_get_int_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -36372,11 +36372,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) { } return retVal___; } -long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { +long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) { int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) { - long long (*preHookFunc) (const config_setting_t *setting); + long long (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func; @@ -36391,7 +36391,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting); } if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) { - long long (*postHookFunc) (long long retVal___, const config_setting_t *setting); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -36399,11 +36399,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) { } return retVal___; } -double HP_libconfig_setting_get_float(const config_setting_t *setting) { +double HP_libconfig_setting_get_float(const struct config_setting_t *setting) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) { - double (*preHookFunc) (const config_setting_t *setting); + double (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func; @@ -36418,7 +36418,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_float(setting); } if( HPMHooks.count.HP_libconfig_setting_get_float_post ) { - double (*postHookFunc) (double retVal___, const config_setting_t *setting); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -36426,11 +36426,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_get_bool(const config_setting_t *setting) { +int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func; @@ -36445,7 +36445,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting); } if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -36453,11 +36453,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) { } return retVal___; } -const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { +const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) { - const char* (*preHookFunc) (const config_setting_t *setting); + const char* (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func; @@ -36472,7 +36472,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_string(setting); } if( HPMHooks.count.HP_libconfig_setting_get_string_post ) { - const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -36480,11 +36480,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) { +struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) { + int hIndex = 0; + struct config_setting_t* retVal___ = NULL; + if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) { + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func; + retVal___ = preHookFunc(setting, name); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_post ) { + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func; @@ -36499,7 +36526,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -36507,11 +36534,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char } return retVal___; } -int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) { +int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func; @@ -36526,7 +36553,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -36534,11 +36561,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha } return retVal___; } -int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) { +int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func; @@ -36553,7 +36580,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -36561,11 +36588,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha } return retVal___; } -int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) { +int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func; @@ -36580,7 +36607,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -36588,11 +36615,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char } return retVal___; } -int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) { +int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) { - int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value); + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func; @@ -36607,7 +36634,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value); } if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name, value); @@ -36615,11 +36642,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch } return retVal___; } -int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { +int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) { - int (*preHookFunc) (config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t *setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func; @@ -36634,7 +36661,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -36642,11 +36669,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) { } return retVal___; } -int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { +int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) { - int (*preHookFunc) (config_setting_t *setting, long long *value); + int (*preHookFunc) (struct config_setting_t *setting, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func; @@ -36661,7 +36688,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -36669,11 +36696,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) { } return retVal___; } -int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { +int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) { - int (*preHookFunc) (config_setting_t *setting, double *value); + int (*preHookFunc) (struct config_setting_t *setting, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func; @@ -36688,7 +36715,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -36696,11 +36723,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) { } return retVal___; } -int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { +int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) { - int (*preHookFunc) (config_setting_t *setting, int *value); + int (*preHookFunc) (struct config_setting_t *setting, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func; @@ -36715,7 +36742,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &value); @@ -36723,11 +36750,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) { } return retVal___; } -int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) { +int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) { - int (*preHookFunc) (config_setting_t *setting, const char *value); + int (*preHookFunc) (struct config_setting_t *setting, const char *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func; @@ -36742,7 +36769,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, value); @@ -36750,11 +36777,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value } return retVal___; } -int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { +int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) { - int (*preHookFunc) (config_setting_t *setting, short *format); + int (*preHookFunc) (struct config_setting_t *setting, short *format); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func; @@ -36769,7 +36796,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format); } if( HPMHooks.count.HP_libconfig_setting_set_format_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format); + int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &format); @@ -36777,11 +36804,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) { } return retVal___; } -short HP_libconfig_setting_get_format(const config_setting_t *setting) { +short HP_libconfig_setting_get_format(const struct config_setting_t *setting) { int hIndex = 0; short retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) { - short (*preHookFunc) (const config_setting_t *setting); + short (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func; @@ -36796,7 +36823,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_get_format(setting); } if( HPMHooks.count.HP_libconfig_setting_get_format_post ) { - short (*postHookFunc) (short retVal___, const config_setting_t *setting); + short (*postHookFunc) (short retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -36804,11 +36831,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) { +int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) { - int (*preHookFunc) (const config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func; @@ -36823,7 +36850,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -36831,11 +36858,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) } return retVal___; } -long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) { +long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; long long retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) { - long long (*preHookFunc) (const config_setting_t *setting, int *idx); + long long (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func; @@ -36850,7 +36877,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) { - long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx); + long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -36858,11 +36885,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i } return retVal___; } -double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) { +double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; double retVal___ = 0.; if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) { - double (*preHookFunc) (const config_setting_t *setting, int *idx); + double (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func; @@ -36877,7 +36904,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) { - double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx); + double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -36885,11 +36912,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int } return retVal___; } -int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) { +int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) { - int (*preHookFunc) (const config_setting_t *setting, int *idx); + int (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func; @@ -36904,7 +36931,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -36912,11 +36939,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) } return retVal___; } -const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) { +const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) { int hIndex = 0; const char* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) { - const char* (*preHookFunc) (const config_setting_t *setting, int *idx); + const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func; @@ -36931,7 +36958,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) { - const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx); + const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -36939,11 +36966,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting } return retVal___; } -config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) { +struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func; @@ -36958,7 +36985,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -36966,11 +36993,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i } return retVal___; } -config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) { +struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func; @@ -36985,7 +37012,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -36993,11 +37020,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) { +struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func; @@ -37012,7 +37039,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -37020,11 +37047,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) { +struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func; @@ -37039,7 +37066,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, &value); @@ -37047,11 +37074,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) { +struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func; @@ -37066,7 +37093,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value); } if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx, value); @@ -37074,11 +37101,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting } return retVal___; } -int HP_libconfig_setting_index(const config_setting_t *setting) { +int HP_libconfig_setting_index(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_index_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func; @@ -37093,7 +37120,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_index(setting); } if( HPMHooks.count.HP_libconfig_setting_index_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -37101,11 +37128,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) { } return retVal___; } -int HP_libconfig_setting_length(const config_setting_t *setting) { +int HP_libconfig_setting_length(const struct config_setting_t *setting) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_length_pre ) { - int (*preHookFunc) (const config_setting_t *setting); + int (*preHookFunc) (const struct config_setting_t *setting); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func; @@ -37120,7 +37147,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) { retVal___ = HPMHooks.source.libconfig.setting_length(setting); } if( HPMHooks.count.HP_libconfig_setting_length_post ) { - int (*postHookFunc) (int retVal___, const config_setting_t *setting); + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting); @@ -37128,11 +37155,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) { } return retVal___; } -config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) { +struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) { - config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func; @@ -37147,7 +37174,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx); } if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, &idx); @@ -37155,11 +37182,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, } return retVal___; } -config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) { +struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) { - config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name); + struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func; @@ -37174,7 +37201,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name); } if( HPMHooks.count.HP_libconfig_setting_get_member_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, setting, name); @@ -37182,11 +37209,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin } return retVal___; } -config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) { +struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_setting_add_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func; @@ -37201,7 +37228,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type); } if( HPMHooks.count.HP_libconfig_setting_add_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name, &type); @@ -37209,11 +37236,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char } return retVal___; } -int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { +int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_pre ) { - int (*preHookFunc) (config_setting_t *parent, const char *name); + int (*preHookFunc) (struct config_setting_t *parent, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func; @@ -37228,7 +37255,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name); } if( HPMHooks.count.HP_libconfig_setting_remove_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, name); @@ -37236,11 +37263,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) { } return retVal___; } -int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) { +int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) { - int (*preHookFunc) (config_setting_t *parent, unsigned int *idx); + int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func; @@ -37255,7 +37282,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx); } if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, &idx); @@ -37263,10 +37290,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) } return retVal___; } -void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { +void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) { - void (*preHookFunc) (config_setting_t *setting, void *hook); + void (*preHookFunc) (struct config_setting_t *setting, void *hook); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func; @@ -37281,7 +37308,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { HPMHooks.source.libconfig.setting_set_hook(setting, hook); } if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) { - void (*postHookFunc) (config_setting_t *setting, void *hook); + void (*postHookFunc) (struct config_setting_t *setting, void *hook); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func; postHookFunc(setting, hook); @@ -37289,11 +37316,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) { } return; } -config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) { +struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) { int hIndex = 0; - config_setting_t* retVal___ = NULL; + struct config_setting_t* retVal___ = NULL; if( HPMHooks.count.HP_libconfig_lookup_pre ) { - config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath); + struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func; @@ -37308,7 +37335,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa retVal___ = HPMHooks.source.libconfig.lookup(config, filepath); } if( HPMHooks.count.HP_libconfig_lookup_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath); + struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath); @@ -37316,38 +37343,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa } return retVal___; } -config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) { - int hIndex = 0; - config_setting_t* retVal___ = NULL; - if( HPMHooks.count.HP_libconfig_lookup_from_pre ) { - config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func; - retVal___ = preHookFunc(setting, filepath); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath); - } - if( HPMHooks.count.HP_libconfig_lookup_from_post ) { - config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func; - retVal___ = postHookFunc(retVal___, setting, filepath); - } - } - return retVal___; -} -int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) { +int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func; @@ -37362,7 +37362,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_int_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -37370,11 +37370,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v } return retVal___; } -int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) { +int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, long long *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func; @@ -37389,7 +37389,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_int64_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -37397,11 +37397,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long } return retVal___; } -int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) { +int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_float_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, double *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func; @@ -37416,7 +37416,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_float_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -37424,11 +37424,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub } return retVal___; } -int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) { +int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, int *value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func; @@ -37443,7 +37443,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int * retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_bool_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -37451,11 +37451,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int * } return retVal___; } -int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) { +int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_lookup_string_pre ) { - int (*preHookFunc) (const config_t *config, const char *filepath, const char **value); + int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func; @@ -37470,7 +37470,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value); } if( HPMHooks.count.HP_libconfig_lookup_string_post ) { - int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value); + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, filepath, value); @@ -37478,14 +37478,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con } return retVal___; } -int HP_libconfig_read_file(config_t *config, const char *config_filename) { +int HP_libconfig_load_file(struct config_t *config, const char *config_filename) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_libconfig_read_file_pre ) { - int (*preHookFunc) (config_t *config, const char *config_filename); + if( HPMHooks.count.HP_libconfig_load_file_pre ) { + int (*preHookFunc) (struct config_t *config, const char *config_filename); *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func; retVal___ = preHookFunc(config, config_filename); } if( *HPMforce_return ) { @@ -37494,21 +37494,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) { } } { - retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename); + retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename); } - if( HPMHooks.count.HP_libconfig_read_file_post ) { - int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename); - for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func; + if( HPMHooks.count.HP_libconfig_load_file_post ) { + int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func; retVal___ = postHookFunc(retVal___, config, config_filename); } } return retVal___; } -void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func; @@ -37523,7 +37523,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set HPMHooks.source.libconfig.setting_copy_simple(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func; postHookFunc(parent, src); @@ -37531,10 +37531,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set } return; } -void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func; @@ -37549,7 +37549,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti HPMHooks.source.libconfig.setting_copy_elem(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func; postHookFunc(parent, src); @@ -37557,10 +37557,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti } return; } -void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) { +void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) { - void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func; @@ -37575,7 +37575,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_ HPMHooks.source.libconfig.setting_copy_aggregate(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) { - void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src); + void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func; postHookFunc(parent, src); @@ -37583,11 +37583,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_ } return; } -int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) { +int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libconfig_setting_copy_pre ) { - int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src); + int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func; @@ -37602,7 +37602,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t * retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src); } if( HPMHooks.count.HP_libconfig_setting_copy_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src); + int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src); for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func; retVal___ = postHookFunc(retVal___, parent, src); @@ -37610,6 +37610,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t * } return retVal___; } +bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) { + bool (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) { + bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) { + int hIndex = 0; + uint32 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) { + uint32 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) { + uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) { + int hIndex = 0; + uint16 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) { + uint16 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) { + uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) { + int hIndex = 0; + int16 retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) { + int16 (*preHookFunc) (const struct config_setting_t *setting); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func; + retVal___ = preHookFunc(setting); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting); + } + if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) { + int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, value); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, value); + } + } + return retVal___; +} +int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) { + int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func; + retVal___ = preHookFunc(setting, name, out, &out_size); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size); + } + if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) { + int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func; + retVal___ = postHookFunc(retVal___, setting, name, out, &out_size); + } + } + return retVal___; +} +int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) { + int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func; + retVal___ = preHookFunc(config, name, out, &out_size); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size); + } + if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) { + int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size); + for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func; + retVal___ = postHookFunc(retVal___, config, name, out, &out_size); + } + } + return retVal___; +} /* logs */ void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) { int hIndex = 0; @@ -46177,11 +46447,11 @@ void HP_mob_readdb(void) { } return; } -bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *value) { +bool HP_mob_lookup_const(const struct config_setting_t *it, const char *name, int *value) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_lookup_const_pre ) { - bool (*preHookFunc) (const config_setting_t *it, const char *name, int *value); + bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_lookup_const_pre[hIndex].func; @@ -46196,7 +46466,7 @@ bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *valu retVal___ = HPMHooks.source.mob.lookup_const(it, name, value); } if( HPMHooks.count.HP_mob_lookup_const_post ) { - bool (*postHookFunc) (bool retVal___, const config_setting_t *it, const char *name, int *value); + bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, const char *name, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_lookup_const_post[hIndex].func; retVal___ = postHookFunc(retVal___, it, name, value); @@ -46204,11 +46474,11 @@ bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *valu } return retVal___; } -bool HP_mob_get_const(const config_setting_t *it, int *value) { +bool HP_mob_get_const(const struct config_setting_t *it, int *value) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mob_get_const_pre ) { - bool (*preHookFunc) (const config_setting_t *it, int *value); + bool (*preHookFunc) (const struct config_setting_t *it, int *value); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_get_const_pre[hIndex].func; @@ -46223,7 +46493,7 @@ bool HP_mob_get_const(const config_setting_t *it, int *value) { retVal___ = HPMHooks.source.mob.get_const(it, value); } if( HPMHooks.count.HP_mob_get_const_post ) { - bool (*postHookFunc) (bool retVal___, const config_setting_t *it, int *value); + bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, int *value); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_get_const_post[hIndex].func; retVal___ = postHookFunc(retVal___, it, value); @@ -46285,10 +46555,10 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) { } return retVal___; } -void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it, int n, const char *source) { +void HP_mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *it, int n, const char *source) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_additional_fields_pre ) { - void (*preHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source); + void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_pre[hIndex].func; @@ -46303,7 +46573,7 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it HPMHooks.source.mob.read_db_additional_fields(entry, it, n, source); } if( HPMHooks.count.HP_mob_read_db_additional_fields_post ) { - void (*postHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source); + void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_post[hIndex].func; postHookFunc(entry, it, &n, source); @@ -46311,11 +46581,11 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it } return; } -int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) { +int HP_mob_read_db_sub(struct config_setting_t *mobt, int id, const char *source) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_read_db_sub_pre ) { - int (*preHookFunc) (config_setting_t *mobt, int *id, const char *source); + int (*preHookFunc) (struct config_setting_t *mobt, int *id, const char *source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_sub_pre[hIndex].func; @@ -46330,7 +46600,7 @@ int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) { retVal___ = HPMHooks.source.mob.read_db_sub(mobt, id, source); } if( HPMHooks.count.HP_mob_read_db_sub_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *mobt, int *id, const char *source); + int (*postHookFunc) (int retVal___, struct config_setting_t *mobt, int *id, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, mobt, &id, source); @@ -46338,10 +46608,10 @@ int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) { } return retVal___; } -void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) { +void HP_mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_drops_sub_pre ) { - void (*preHookFunc) (struct mob_db *entry, config_setting_t *t); + void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_pre[hIndex].func; @@ -46356,7 +46626,7 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) { HPMHooks.source.mob.read_db_drops_sub(entry, t); } if( HPMHooks.count.HP_mob_read_db_drops_sub_post ) { - void (*postHookFunc) (struct mob_db *entry, config_setting_t *t); + void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_post[hIndex].func; postHookFunc(entry, t); @@ -46364,10 +46634,10 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) { } return; } -void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) { +void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre ) { - void (*preHookFunc) (struct mob_db *entry, config_setting_t *t); + void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_pre[hIndex].func; @@ -46382,7 +46652,7 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) { HPMHooks.source.mob.read_db_mvpdrops_sub(entry, t); } if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post ) { - void (*postHookFunc) (struct mob_db *entry, config_setting_t *t); + void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_post[hIndex].func; postHookFunc(entry, t); @@ -46390,11 +46660,11 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) { } return; } -int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) { +int HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_read_db_mode_sub_pre ) { - int (*preHookFunc) (struct mob_db *entry, config_setting_t *t); + int (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_pre[hIndex].func; @@ -46409,7 +46679,7 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) { retVal___ = HPMHooks.source.mob.read_db_mode_sub(entry, t); } if( HPMHooks.count.HP_mob_read_db_mode_sub_post ) { - int (*postHookFunc) (int retVal___, struct mob_db *entry, config_setting_t *t); + int (*postHookFunc) (int retVal___, struct mob_db *entry, struct config_setting_t *t); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, entry, t); @@ -46417,10 +46687,10 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) { } return retVal___; } -void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) { +void HP_mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; if( HPMHooks.count.HP_mob_read_db_stats_sub_pre ) { - void (*preHookFunc) (struct mob_db *entry, config_setting_t *t); + void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_pre[hIndex].func; @@ -46435,7 +46705,7 @@ void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) { HPMHooks.source.mob.read_db_stats_sub(entry, t); } if( HPMHooks.count.HP_mob_read_db_stats_sub_post ) { - void (*postHookFunc) (struct mob_db *entry, config_setting_t *t); + void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_post[hIndex].func; postHookFunc(entry, t); @@ -59336,11 +59606,11 @@ int HP_quest_read_db(void) { } return retVal___; } -struct quest_db* HP_quest_read_db_sub(config_setting_t *cs, int n, const char *source) { +struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const char *source) { int hIndex = 0; struct quest_db* retVal___ = NULL; if( HPMHooks.count.HP_quest_read_db_sub_pre ) { - struct quest_db* (*preHookFunc) (config_setting_t *cs, int *n, const char *source); + struct quest_db* (*preHookFunc) (struct config_setting_t *cs, int *n, const char *source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_quest_read_db_sub_pre[hIndex].func; @@ -59355,7 +59625,7 @@ struct quest_db* HP_quest_read_db_sub(config_setting_t *cs, int n, const char *s retVal___ = HPMHooks.source.quest.read_db_sub(cs, n, source); } if( HPMHooks.count.HP_quest_read_db_sub_post ) { - struct quest_db* (*postHookFunc) (struct quest_db* retVal___, config_setting_t *cs, int *n, const char *source); + struct quest_db* (*postHookFunc) (struct quest_db* retVal___, struct config_setting_t *cs, int *n, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_quest_read_db_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, cs, &n, source); @@ -70991,11 +71261,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) { } return retVal___; } -int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { +int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) { - int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func; @@ -71010,7 +71280,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname); } if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); + int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname); for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, t, list, filename, groupname); @@ -74830,11 +75100,11 @@ int HP_status_readdb_refine_libconfig(const char *filename) { } return retVal___; } -int HP_status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, const char *source) { +int HP_status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre ) { - int (*preHookFunc) (config_setting_t *r, const char *name, const char *source); + int (*preHookFunc) (struct config_setting_t *r, const char *name, const char *source); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_pre[hIndex].func; @@ -74849,7 +75119,7 @@ int HP_status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, retVal___ = HPMHooks.source.status.readdb_refine_libconfig_sub(r, name, source); } if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post ) { - int (*postHookFunc) (int retVal___, config_setting_t *r, const char *name, const char *source); + int (*postHookFunc) (int retVal___, struct config_setting_t *r, const char *name, const char *source); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, r, name, source); @@ -74910,10 +75180,10 @@ void HP_status_read_job_db(void) { } return; } -void HP_status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) { +void HP_status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb) { int hIndex = 0; if( HPMHooks.count.HP_status_read_job_db_sub_pre ) { - void (*preHookFunc) (int *idx, const char *name, config_setting_t *jdb); + void (*preHookFunc) (int *idx, const char *name, struct config_setting_t *jdb); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_read_job_db_sub_pre[hIndex].func; @@ -74928,7 +75198,7 @@ void HP_status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) HPMHooks.source.status.read_job_db_sub(idx, name, jdb); } if( HPMHooks.count.HP_status_read_job_db_sub_post ) { - void (*postHookFunc) (int *idx, const char *name, config_setting_t *jdb); + void (*postHookFunc) (int *idx, const char *name, struct config_setting_t *jdb); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_read_job_db_sub_post[hIndex].func; postHookFunc(&idx, name, jdb); diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c index 44e2bac3c..ee6b0548a 100644 --- a/src/plugins/db2sql.c +++ b/src/plugins/db2sql.c @@ -65,9 +65,9 @@ bool itemdb2sql_torun = false; bool mobdb2sql_torun = false; /// Backup of the original item_db parser function pointer. -int (*itemdb_readdb_libconfig_sub) (config_setting_t *it, int n, const char *source); +int (*itemdb_readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source); /// Backup of the original mob_db parser function pointer. -int (*mob_read_db_sub) (config_setting_t *it, int n, const char *source); +int (*mob_read_db_sub) (struct config_setting_t *it, int n, const char *source); /** * Normalizes and appends a string to the output buffer. @@ -124,7 +124,7 @@ void db2sql_fileheader(void) * * @see itemdb_readdb_libconfig_sub. */ -int itemdb2sql_sub(config_setting_t *entry, int n, const char *source) +int itemdb2sql_sub(struct config_setting_t *entry, int n, const char *source) { struct item_data *it = NULL; @@ -134,7 +134,7 @@ int itemdb2sql_sub(config_setting_t *entry, int n, const char *source) char *str; int i32; uint32 ui32; - config_setting_t *t = NULL; + struct config_setting_t *t = NULL; StringBuf buf; nullpo_ret(entry); @@ -424,7 +424,7 @@ void do_itemdb2sql(void) * * @see mobdb_readdb_libconfig_sub. */ -int mobdb2sql_sub(config_setting_t *mobt, int n, const char *source) +int mobdb2sql_sub(struct config_setting_t *mobt, int n, const char *source) { struct mob_db *md = NULL; nullpo_ret(mobt); diff --git a/src/test/test_libconfig.c b/src/test/test_libconfig.c index ff742af71..a3b233b98 100644 --- a/src/test/test_libconfig.c +++ b/src/test/test_libconfig.c @@ -71,7 +71,7 @@ static const char *test_libconfig_defaults(void) static const char *test_libconfig_init_destroy(void) { - config_t config; + struct config_t config; libconfig->init(&config); if (config.root == NULL || config.root != config_root_setting(&config)) { return "Unable to create config."; @@ -85,7 +85,7 @@ static const char *test_libconfig_init_destroy(void) static const char *test_libconfig_read_file_src(void) { - config_t config; + struct config_t config; #define FILENAME "src/test/libconfig/test.conf" if (libconfig->read_file_src(&config, FILENAME) == CONFIG_FALSE) { libconfig->destroy(&config); @@ -102,7 +102,7 @@ static const char *test_libconfig_read_file_src(void) static const char *test_libconfig_read(void) { - config_t config; + struct config_t config; #define FILENAME "src/test/libconfig/test.conf" FILE *fp = fopen(FILENAME, "r"); if (!fp) { @@ -122,11 +122,11 @@ static const char *test_libconfig_read(void) return NULL; } -static const char *test_libconfig_read_file(void) +static const char *test_libconfig_load_file(void) { - config_t config; + struct config_t config; #define FILENAME "src/test/libconfig/test.conf" - if (libconfig->read_file(&config, FILENAME) != 0) { + if (libconfig->load_file(&config, FILENAME) == CONFIG_FALSE) { return "Unable to read file '" FILENAME "'."; } #undef FILENAME @@ -140,19 +140,19 @@ static const char *test_libconfig_read_file(void) static const char *test_libconfig_write(void) { - //void (*write) (const config_t *config, FILE *stream); + //void (*write) (const struct config_t *config, FILE *stream); return "TEST NOT IMPLEMENTED"; } static const char *test_libconfig_write_file(void) { - //int (*write_file) (config_t *config, const char *filename); + //int (*write_file) (struct config_t *config, const char *filename); return "TEST NOT IMPLEMENTED"; } static const char *test_libconfig_read_string(void) { - config_t config; + struct config_t config; if (libconfig->read_string(&config, "") == CONFIG_FALSE) { libconfig->destroy(&config); return "Unable to read from string."; @@ -167,7 +167,7 @@ static const char *test_libconfig_read_string(void) static const char *test_libconfig_syntax(void) { - config_t config; + struct config_t config; const char *input = "/* Test File */\n" "Setting_Int: 1;\n" "Setting_Int64: 1L;\n" @@ -193,14 +193,14 @@ static const char *test_libconfig_syntax(void) static const char *test_libconfig_set_include_dir(void) { - //void (*set_include_dir) (config_t *config, const char *include_dir); + //void (*set_include_dir) (struct config_t *config, const char *include_dir); return "TEST NOT IMPLEMENTED"; } static const char *test_libconfig_lookup(void) { - config_t config; - config_setting_t *t = NULL; + struct config_t config; + struct config_setting_t *t = NULL; int32 i32; int64 i64; double f; @@ -226,9 +226,9 @@ static const char *test_libconfig_lookup(void) return "libconfig->lookup failed."; } - if ((t = libconfig->lookup_from(config.root, "Setting_Int")) == NULL) { + if ((t = libconfig->setting_lookup(config.root, "Setting_Int")) == NULL) { libconfig->destroy(&config); - return "libconfig->lookup_from failed."; + return "libconfig->setting_lookup failed."; } if (libconfig->lookup_int(&config, "Setting_Int", &i32) == CONFIG_FALSE || i32 != 1) { @@ -263,8 +263,8 @@ static const char *test_libconfig_lookup(void) static const char *test_libconfig_setting_get(void) { - config_t config; - config_setting_t *t = NULL; + struct config_t config; + struct config_setting_t *t = NULL; double f; const char *str; const char *input = "/* Test File */\n" @@ -366,17 +366,17 @@ static const char *test_libconfig_setting_get(void) static const char *test_libconfig_set(void) { - //int (*setting_set_int) (config_setting_t *setting ,int value); - //int (*setting_set_int64) (config_setting_t *setting, long long value); - //int (*setting_set_float) (config_setting_t *setting, double value); - //int (*setting_set_bool) (config_setting_t *setting, int value); - //int (*setting_set_string) (config_setting_t *setting, const char *value); + //int (*setting_set_int) (struct config_setting_t *setting ,int value); + //int (*setting_set_int64) (struct config_setting_t *setting, long long value); + //int (*setting_set_float) (struct config_setting_t *setting, double value); + //int (*setting_set_bool) (struct config_setting_t *setting, int value); + //int (*setting_set_string) (struct config_setting_t *setting, const char *value); return "TEST NOT IMPLEMENTED"; } static const char *test_libconfig_setting_lookup(void) { - config_t config; + struct config_t config; int32 i32; int64 i64; double f; @@ -429,8 +429,8 @@ static const char *test_libconfig_setting_lookup(void) static const char *test_libconfig_setting_types(void) { - config_t config; - config_setting_t *t; + struct config_t config; + struct config_setting_t *t; const char *input = "/* Test File */\n" "Setting_Int: 1;\n" "Setting_Int64: 1L;\n" @@ -523,7 +523,7 @@ static const char *test_libconfig_setting_types(void) static const char *test_libconfig_values(void) { - config_t config; + struct config_t config; int32 i32; int64 i64; const char *input = "/* Test File */\n" @@ -583,7 +583,7 @@ static const char *test_libconfig_values(void) static const char *test_libconfig_path_lookup(void) { - config_t config; + struct config_t config; int32 i32; const char *input = "/* Test File */\n" "Setting_Array: [1, 2, 3];\n" @@ -666,7 +666,7 @@ static const char *test_libconfig_path_lookup(void) static const char *test_libconfig_setting_names(void) { - config_t config; + struct config_t config; int32 i32; const char *input = "/* Test File */\n" "Setting'with'apostrophes: 1;\n" @@ -724,9 +724,9 @@ static const char *test_libconfig_setting_names(void) static const char *test_libconfig_duplicate_keys(void) { - config_t config; + struct config_t config; int32 i32; - config_setting_t *t, *tt; + struct config_setting_t *t, *tt; int i = 0; const char *input = "/* Test File */\n" "Setting_Group: {\n" @@ -775,7 +775,7 @@ static const char *test_libconfig_duplicate_keys(void) static const char *test_libconfig_special_string_syntax(void) { - config_t config; + struct config_t config; const char *str; const char *input = "/* Test File */\n" "SpecialString: <\"This is an \"Item_Script\" Special String\n\tWith a line-break inside.\">;\n" @@ -809,33 +809,33 @@ int do_init(int argc, char **argv) TEST("libconfig->init and libconfig->destroy", test_libconfig_init_destroy); TEST("libconfig->read_file_src", test_libconfig_read_file_src); TEST("libconfig->read", test_libconfig_read); - TEST("libconfig->read_file", test_libconfig_read_file); + TEST("libconfig->load_file", test_libconfig_load_file); (void)test_libconfig_write; //TEST("libconfig->write", test_libconfig_write); (void)test_libconfig_write_file; //TEST("libconfig->write_file", test_libconfig_write_file); TEST("libconfig->read_string", test_libconfig_read_string); TEST("libconfig syntax", test_libconfig_syntax); (void)test_libconfig_set_include_dir; //TEST("libconfig->set_include_dir", test_libconfig_set_include_dir); - //int (*setting_set_format) (config_setting_t *setting, short format); - //short (*setting_get_format) (const config_setting_t *setting); - //config_setting_t * (*setting_set_int_elem) (config_setting_t *setting, int idx, int value); - //config_setting_t * (*setting_set_int64_elem) (config_setting_t *setting, int idx, long long value); - //config_setting_t * (*setting_set_float_elem) (config_setting_t *setting, int idx, double value); - //config_setting_t * (*setting_set_bool_elem) (config_setting_t *setting, int idx, int value); - //config_setting_t * (*setting_set_string_elem) (config_setting_t *setting, int idx, const char *value); - //config_setting_t * (*setting_add) (config_setting_t *parent, const char *name, int type); - //int (*setting_remove) (config_setting_t *parent, const char *name); - //int (*setting_remove_elem) (config_setting_t *parent, unsigned int idx); - //void (*setting_set_hook) (config_setting_t *setting, void *hook); - //void (*set_destructor) (config_t *config, void (*destructor)(void *)); + //int (*setting_set_format) (struct config_setting_t *setting, short format); + //short (*setting_get_format) (const struct config_setting_t *setting); + //struct config_setting_t * (*setting_set_int_elem) (struct config_setting_t *setting, int idx, int value); + //struct config_setting_t * (*setting_set_int64_elem) (struct config_setting_t *setting, int idx, long long value); + //struct config_setting_t * (*setting_set_float_elem) (struct config_setting_t *setting, int idx, double value); + //struct config_setting_t * (*setting_set_bool_elem) (struct config_setting_t *setting, int idx, int value); + //struct config_setting_t * (*setting_set_string_elem) (struct config_setting_t *setting, int idx, const char *value); + //struct config_setting_t * (*setting_add) (struct config_setting_t *parent, const char *name, int type); + //int (*setting_remove) (struct config_setting_t *parent, const char *name); + //int (*setting_remove_elem) (struct config_setting_t *parent, unsigned int idx); + //void (*setting_set_hook) (struct config_setting_t *setting, void *hook); + //void (*set_destructor) (struct config_t *config, void (*destructor)(void *)); TEST("libconfig->lookup_*", test_libconfig_lookup); TEST("libconfig->setting_get_*", test_libconfig_setting_get); (void)test_libconfig_set; //TEST("libconfig->setting_set_*", test_libconfig_setting_set); TEST("libconfig->setting_lookup_*", test_libconfig_setting_lookup); TEST("setting types", test_libconfig_setting_types); - //void (*setting_copy_simple) (config_setting_t *parent, const config_setting_t *src); - //void (*setting_copy_elem) (config_setting_t *parent, const config_setting_t *src); - //void (*setting_copy_aggregate) (config_setting_t *parent, const config_setting_t *src); - //int (*setting_copy) (config_setting_t *parent, const config_setting_t *src); + //void (*setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src); + //void (*setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src); + //void (*setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src); + //int (*setting_copy) (struct config_setting_t *parent, const struct config_setting_t *src); TEST("values", test_libconfig_values); TEST("path lookup", test_libconfig_path_lookup); TEST("setting key names", test_libconfig_setting_names); |