diff options
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc | 92 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc | 23 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_char.Hooks.inc | 1081 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc | 80 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc | 20 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_login.Hooks.inc | 790 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc | 96 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc | 24 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 1337 | ||||
| -rw-r--r-- | src/plugins/Makefile.in | 4 | ||||
| -rw-r--r-- | src/plugins/constdb2doc.c | 197 | ||||
| -rw-r--r-- | src/plugins/db2sql.c | 603 | ||||
| -rw-r--r-- | src/plugins/sample.c | 8 |
13 files changed, 3147 insertions, 1208 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc index dd6b3d5d6..89bb847ce 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; @@ -762,6 +782,8 @@ struct { struct HPMHookPoint *HP_iMalloc_reallocz_post; struct HPMHookPoint *HP_iMalloc_astrdup_pre; struct HPMHookPoint *HP_iMalloc_astrdup_post; + struct HPMHookPoint *HP_iMalloc_astrndup_pre; + struct HPMHookPoint *HP_iMalloc_astrndup_post; struct HPMHookPoint *HP_iMalloc_free_pre; struct HPMHookPoint *HP_iMalloc_free_post; struct HPMHookPoint *HP_iMalloc_memory_check_pre; @@ -818,6 +840,8 @@ struct { struct HPMHookPoint *HP_mapif_auction_bid_post; struct HPMHookPoint *HP_mapif_parse_auction_bid_pre; struct HPMHookPoint *HP_mapif_parse_auction_bid_post; + struct HPMHookPoint *HP_mapif_elemental_create_pre; + struct HPMHookPoint *HP_mapif_elemental_create_post; struct HPMHookPoint *HP_mapif_elemental_save_pre; struct HPMHookPoint *HP_mapif_elemental_save_post; struct HPMHookPoint *HP_mapif_elemental_load_pre; @@ -918,6 +942,8 @@ struct { struct HPMHookPoint *HP_mapif_homunculus_saved_post; struct HPMHookPoint *HP_mapif_homunculus_renamed_pre; struct HPMHookPoint *HP_mapif_homunculus_renamed_post; + struct HPMHookPoint *HP_mapif_homunculus_create_pre; + struct HPMHookPoint *HP_mapif_homunculus_create_post; struct HPMHookPoint *HP_mapif_homunculus_save_pre; struct HPMHookPoint *HP_mapif_homunculus_save_post; struct HPMHookPoint *HP_mapif_homunculus_load_pre; @@ -962,6 +988,8 @@ struct { struct HPMHookPoint *HP_mapif_mail_send_post; struct HPMHookPoint *HP_mapif_parse_mail_send_pre; struct HPMHookPoint *HP_mapif_parse_mail_send_post; + struct HPMHookPoint *HP_mapif_mercenary_create_pre; + struct HPMHookPoint *HP_mapif_mercenary_create_post; struct HPMHookPoint *HP_mapif_mercenary_save_pre; struct HPMHookPoint *HP_mapif_mercenary_save_post; struct HPMHookPoint *HP_mapif_mercenary_load_pre; @@ -1356,6 +1384,8 @@ struct { struct HPMHookPoint *HP_sysinfo_compiler_post; struct HPMHookPoint *HP_sysinfo_cflags_pre; struct HPMHookPoint *HP_sysinfo_cflags_post; + struct HPMHookPoint *HP_sysinfo_time_pre; + struct HPMHookPoint *HP_sysinfo_time_post; struct HPMHookPoint *HP_sysinfo_vcstype_pre; struct HPMHookPoint *HP_sysinfo_vcstype_post; struct HPMHookPoint *HP_sysinfo_vcstypeid_pre; @@ -1987,10 +2017,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; @@ -2015,6 +2045,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; @@ -2077,8 +2109,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; @@ -2089,8 +2119,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; @@ -2099,6 +2129,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; @@ -2139,6 +2189,8 @@ struct { int HP_iMalloc_reallocz_post; int HP_iMalloc_astrdup_pre; int HP_iMalloc_astrdup_post; + int HP_iMalloc_astrndup_pre; + int HP_iMalloc_astrndup_post; int HP_iMalloc_free_pre; int HP_iMalloc_free_post; int HP_iMalloc_memory_check_pre; @@ -2195,6 +2247,8 @@ struct { int HP_mapif_auction_bid_post; int HP_mapif_parse_auction_bid_pre; int HP_mapif_parse_auction_bid_post; + int HP_mapif_elemental_create_pre; + int HP_mapif_elemental_create_post; int HP_mapif_elemental_save_pre; int HP_mapif_elemental_save_post; int HP_mapif_elemental_load_pre; @@ -2295,6 +2349,8 @@ struct { int HP_mapif_homunculus_saved_post; int HP_mapif_homunculus_renamed_pre; int HP_mapif_homunculus_renamed_post; + int HP_mapif_homunculus_create_pre; + int HP_mapif_homunculus_create_post; int HP_mapif_homunculus_save_pre; int HP_mapif_homunculus_save_post; int HP_mapif_homunculus_load_pre; @@ -2339,6 +2395,8 @@ struct { int HP_mapif_mail_send_post; int HP_mapif_parse_mail_send_pre; int HP_mapif_parse_mail_send_post; + int HP_mapif_mercenary_create_pre; + int HP_mapif_mercenary_create_post; int HP_mapif_mercenary_save_pre; int HP_mapif_mercenary_save_post; int HP_mapif_mercenary_load_pre; @@ -2733,6 +2791,8 @@ struct { int HP_sysinfo_compiler_post; int HP_sysinfo_cflags_pre; int HP_sysinfo_cflags_post; + int HP_sysinfo_time_pre; + int HP_sysinfo_time_post; int HP_sysinfo_vcstype_pre; int HP_sysinfo_vcstype_post; int HP_sysinfo_vcstypeid_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc index 34a9e4005..f579fb301 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) }, @@ -413,6 +423,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(iMalloc->realloc, HP_iMalloc_realloc) }, { HP_POP(iMalloc->reallocz, HP_iMalloc_reallocz) }, { HP_POP(iMalloc->astrdup, HP_iMalloc_astrdup) }, + { HP_POP(iMalloc->astrndup, HP_iMalloc_astrndup) }, { HP_POP(iMalloc->free, HP_iMalloc_free) }, { HP_POP(iMalloc->memory_check, HP_iMalloc_memory_check) }, { HP_POP(iMalloc->verify_ptr, HP_iMalloc_verify_ptr) }, @@ -442,6 +453,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapif->parse_auction_close, HP_mapif_parse_auction_close) }, { HP_POP(mapif->auction_bid, HP_mapif_auction_bid) }, { HP_POP(mapif->parse_auction_bid, HP_mapif_parse_auction_bid) }, + { HP_POP(mapif->elemental_create, HP_mapif_elemental_create) }, { HP_POP(mapif->elemental_save, HP_mapif_elemental_save) }, { HP_POP(mapif->elemental_load, HP_mapif_elemental_load) }, { HP_POP(mapif->elemental_delete, HP_mapif_elemental_delete) }, @@ -492,6 +504,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapif->homunculus_loaded, HP_mapif_homunculus_loaded) }, { HP_POP(mapif->homunculus_saved, HP_mapif_homunculus_saved) }, { HP_POP(mapif->homunculus_renamed, HP_mapif_homunculus_renamed) }, + { HP_POP(mapif->homunculus_create, HP_mapif_homunculus_create) }, { HP_POP(mapif->homunculus_save, HP_mapif_homunculus_save) }, { HP_POP(mapif->homunculus_load, HP_mapif_homunculus_load) }, { HP_POP(mapif->homunculus_delete, HP_mapif_homunculus_delete) }, @@ -514,6 +527,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mapif->parse_mail_return, HP_mapif_parse_mail_return) }, { HP_POP(mapif->mail_send, HP_mapif_mail_send) }, { HP_POP(mapif->parse_mail_send, HP_mapif_parse_mail_send) }, + { HP_POP(mapif->mercenary_create, HP_mapif_mercenary_create) }, { HP_POP(mapif->mercenary_save, HP_mapif_mercenary_save) }, { HP_POP(mapif->mercenary_load, HP_mapif_mercenary_load) }, { HP_POP(mapif->mercenary_delete, HP_mapif_mercenary_delete) }, @@ -721,6 +735,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sysinfo->is64bit, HP_sysinfo_is64bit) }, { HP_POP(sysinfo->compiler, HP_sysinfo_compiler) }, { HP_POP(sysinfo->cflags, HP_sysinfo_cflags) }, + { HP_POP(sysinfo->time, HP_sysinfo_time) }, { HP_POP(sysinfo->vcstype, HP_sysinfo_vcstype) }, { HP_POP(sysinfo->vcstypeid, HP_sysinfo_vcstypeid) }, { HP_POP(sysinfo->vcsrevision_src, HP_sysinfo_vcsrevision_src) }, diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc index b1554aefd..6ede0eb2b 100644 --- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc @@ -771,11 +771,11 @@ int HP_chr_check_char_name(char *name, char *esc_name) { } return retVal___; } -int HP_chr_make_new_char_sql(struct char_session_data *sd, char *name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style) { +int HP_chr_make_new_char_sql(struct char_session_data *sd, const char *name_, int str, int agi, int vit, int int_, int dex, int luk, int slot, int hair_color, int hair_style) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_chr_make_new_char_sql_pre ) { - int (*preHookFunc) (struct char_session_data *sd, char *name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); + int (*preHookFunc) (struct char_session_data *sd, const char *name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_make_new_char_sql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_make_new_char_sql_pre[hIndex].func; @@ -790,7 +790,7 @@ int HP_chr_make_new_char_sql(struct char_session_data *sd, char *name_, int str, retVal___ = HPMHooks.source.chr.make_new_char_sql(sd, name_, str, agi, vit, int_, dex, luk, slot, hair_color, hair_style); } if( HPMHooks.count.HP_chr_make_new_char_sql_post ) { - int (*postHookFunc) (int retVal___, struct char_session_data *sd, char *name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); + int (*postHookFunc) (int retVal___, struct char_session_data *sd, const char *name_, int *str, int *agi, int *vit, int *int_, int *dex, int *luk, int *slot, int *hair_color, int *hair_style); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_make_new_char_sql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_make_new_char_sql_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name_, &str, &agi, &vit, &int_, &dex, &luk, &slot, &hair_color, &hair_style); @@ -2137,10 +2137,10 @@ void HP_chr_parse_frommap_char_select_req(int fd) { } return; } -void HP_chr_change_map_server_ack(int fd, uint8 *data, bool ok) { +void HP_chr_change_map_server_ack(int fd, const uint8 *data, bool ok) { int hIndex = 0; if( HPMHooks.count.HP_chr_change_map_server_ack_pre ) { - void (*preHookFunc) (int *fd, uint8 *data, bool *ok); + void (*preHookFunc) (int *fd, const uint8 *data, bool *ok); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_change_map_server_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_chr_change_map_server_ack_pre[hIndex].func; @@ -2155,7 +2155,7 @@ void HP_chr_change_map_server_ack(int fd, uint8 *data, bool ok) { HPMHooks.source.chr.change_map_server_ack(fd, data, ok); } if( HPMHooks.count.HP_chr_change_map_server_ack_post ) { - void (*postHookFunc) (int *fd, uint8 *data, bool *ok); + void (*postHookFunc) (int *fd, const uint8 *data, bool *ok); for(hIndex = 0; hIndex < HPMHooks.count.HP_chr_change_map_server_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_chr_change_map_server_ack_post[hIndex].func; postHookFunc(&fd, data, &ok); @@ -5865,11 +5865,11 @@ void HP_inter_guild_sql_final(void) { } return; } -int HP_inter_guild_search_guildname(char *str) { +int HP_inter_guild_search_guildname(const char *str) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_guild_search_guildname_pre ) { - int (*preHookFunc) (char *str); + int (*preHookFunc) (const char *str); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_search_guildname_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_guild_search_guildname_pre[hIndex].func; @@ -5884,7 +5884,7 @@ int HP_inter_guild_search_guildname(char *str) { retVal___ = HPMHooks.source.inter_guild.search_guildname(str); } if( HPMHooks.count.HP_inter_guild_search_guildname_post ) { - int (*postHookFunc) (int retVal___, char *str); + int (*postHookFunc) (int retVal___, const char *str); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_guild_search_guildname_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_guild_search_guildname_post[hIndex].func; retVal___ = postHookFunc(retVal___, str); @@ -7391,15 +7391,15 @@ int HP_inter_party_CharOffline(int char_id, int party_id) { return retVal___; } /* inter_pet */ -int HP_inter_pet_tosql(int pet_id, struct s_pet *p) { +int HP_inter_pet_tosql(const struct s_pet *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_pet_tosql_pre ) { - int (*preHookFunc) (int *pet_id, struct s_pet *p); + int (*preHookFunc) (const struct s_pet *p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_pet_tosql_pre[hIndex].func; - retVal___ = preHookFunc(&pet_id, p); + retVal___ = preHookFunc(p); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -7407,13 +7407,13 @@ int HP_inter_pet_tosql(int pet_id, struct s_pet *p) { } } { - retVal___ = HPMHooks.source.inter_pet.tosql(pet_id, p); + retVal___ = HPMHooks.source.inter_pet.tosql(p); } if( HPMHooks.count.HP_inter_pet_tosql_post ) { - int (*postHookFunc) (int retVal___, int *pet_id, struct s_pet *p); + int (*postHookFunc) (int retVal___, const struct s_pet *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_pet_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_pet_tosql_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &pet_id, p); + retVal___ = postHookFunc(retVal___, p); } } return retVal___; @@ -7635,11 +7635,11 @@ int HP_inter_storage_fromsql(int account_id, struct storage_data *p) { } return retVal___; } -int HP_inter_storage_guild_storage_tosql(int guild_id, struct guild_storage *p) { +int HP_inter_storage_guild_storage_tosql(int guild_id, const struct guild_storage *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_inter_storage_guild_storage_tosql_pre ) { - int (*preHookFunc) (int *guild_id, struct guild_storage *p); + int (*preHookFunc) (int *guild_id, const struct guild_storage *p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_tosql_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_tosql_pre[hIndex].func; @@ -7654,7 +7654,7 @@ int HP_inter_storage_guild_storage_tosql(int guild_id, struct guild_storage *p) retVal___ = HPMHooks.source.inter_storage.guild_storage_tosql(guild_id, p); } if( HPMHooks.count.HP_inter_storage_guild_storage_tosql_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, struct guild_storage *p); + int (*postHookFunc) (int retVal___, int *guild_id, const struct guild_storage *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_inter_storage_guild_storage_tosql_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_inter_storage_guild_storage_tosql_post[hIndex].func; retVal___ = postHookFunc(retVal___, &guild_id, p); @@ -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; @@ -9907,6 +10177,33 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * } return retVal___; } +char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line, const char *func) { + int hIndex = 0; + char* retVal___ = NULL; + if( HPMHooks.count.HP_iMalloc_astrndup_pre ) { + char* (*preHookFunc) (const char *p, size_t *size, const char *file, int *line, const char *func); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_iMalloc_astrndup_pre[hIndex].func; + retVal___ = preHookFunc(p, &size, file, &line, func); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.iMalloc.astrndup(p, size, file, line, func); + } + if( HPMHooks.count.HP_iMalloc_astrndup_post ) { + char* (*postHookFunc) (char* retVal___, const char *p, size_t *size, const char *file, int *line, const char *func); + for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_iMalloc_astrndup_post[hIndex].func; + retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + } + } + return retVal___; +} void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_free_pre ) { @@ -10248,11 +10545,11 @@ void HP_mapif_char_ban(int char_id, time_t timestamp) { } return; } -int HP_mapif_sendall(unsigned char *buf, unsigned int len) { +int HP_mapif_sendall(const unsigned char *buf, unsigned int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_sendall_pre ) { - int (*preHookFunc) (unsigned char *buf, unsigned int *len); + int (*preHookFunc) (const unsigned char *buf, unsigned int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sendall_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_sendall_pre[hIndex].func; @@ -10267,7 +10564,7 @@ int HP_mapif_sendall(unsigned char *buf, unsigned int len) { retVal___ = HPMHooks.source.mapif.sendall(buf, len); } if( HPMHooks.count.HP_mapif_sendall_post ) { - int (*postHookFunc) (int retVal___, unsigned char *buf, unsigned int *len); + int (*postHookFunc) (int retVal___, const unsigned char *buf, unsigned int *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_sendall_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_sendall_post[hIndex].func; retVal___ = postHookFunc(retVal___, buf, &len); @@ -10641,12 +10938,39 @@ void HP_mapif_parse_auction_bid(int fd) { } return; } -bool HP_mapif_elemental_save(struct s_elemental *ele) { +bool HP_mapif_elemental_create(struct s_elemental *ele) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_mapif_elemental_save_pre ) { + if( HPMHooks.count.HP_mapif_elemental_create_pre ) { bool (*preHookFunc) (struct s_elemental *ele); *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_create_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_mapif_elemental_create_pre[hIndex].func; + retVal___ = preHookFunc(ele); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.mapif.elemental_create(ele); + } + if( HPMHooks.count.HP_mapif_elemental_create_post ) { + bool (*postHookFunc) (bool retVal___, struct s_elemental *ele); + for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_create_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_mapif_elemental_create_post[hIndex].func; + retVal___ = postHookFunc(retVal___, ele); + } + } + return retVal___; +} +bool HP_mapif_elemental_save(const struct s_elemental *ele) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_mapif_elemental_save_pre ) { + bool (*preHookFunc) (const struct s_elemental *ele); + *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_elemental_save_pre[hIndex].func; retVal___ = preHookFunc(ele); @@ -10660,7 +10984,7 @@ bool HP_mapif_elemental_save(struct s_elemental *ele) { retVal___ = HPMHooks.source.mapif.elemental_save(ele); } if( HPMHooks.count.HP_mapif_elemental_save_post ) { - bool (*postHookFunc) (bool retVal___, struct s_elemental *ele); + bool (*postHookFunc) (bool retVal___, const struct s_elemental *ele); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_elemental_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_elemental_save_post[hIndex].func; retVal___ = postHookFunc(retVal___, ele); @@ -10748,10 +11072,10 @@ void HP_mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag } return; } -void HP_mapif_parse_elemental_create(int fd, struct s_elemental *ele) { +void HP_mapif_parse_elemental_create(int fd, const struct s_elemental *ele) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_elemental_create_pre ) { - void (*preHookFunc) (int *fd, struct s_elemental *ele); + void (*preHookFunc) (int *fd, const struct s_elemental *ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_elemental_create_pre[hIndex].func; @@ -10766,7 +11090,7 @@ void HP_mapif_parse_elemental_create(int fd, struct s_elemental *ele) { HPMHooks.source.mapif.parse_elemental_create(fd, ele); } if( HPMHooks.count.HP_mapif_parse_elemental_create_post ) { - void (*postHookFunc) (int *fd, struct s_elemental *ele); + void (*postHookFunc) (int *fd, const struct s_elemental *ele); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_elemental_create_post[hIndex].func; postHookFunc(&fd, ele); @@ -10878,10 +11202,10 @@ void HP_mapif_elemental_saved(int fd, unsigned char flag) { } return; } -void HP_mapif_parse_elemental_save(int fd, struct s_elemental *ele) { +void HP_mapif_parse_elemental_save(int fd, const struct s_elemental *ele) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_elemental_save_pre ) { - void (*preHookFunc) (int *fd, struct s_elemental *ele); + void (*preHookFunc) (int *fd, const struct s_elemental *ele); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_elemental_save_pre[hIndex].func; @@ -10896,7 +11220,7 @@ void HP_mapif_parse_elemental_save(int fd, struct s_elemental *ele) { HPMHooks.source.mapif.parse_elemental_save(fd, ele); } if( HPMHooks.count.HP_mapif_parse_elemental_save_post ) { - void (*postHookFunc) (int *fd, struct s_elemental *ele); + void (*postHookFunc) (int *fd, const struct s_elemental *ele); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_elemental_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_elemental_save_post[hIndex].func; postHookFunc(&fd, ele); @@ -11093,11 +11417,11 @@ int HP_mapif_guild_broken(int guild_id, int flag) { } return retVal___; } -int HP_mapif_guild_message(int guild_id, int account_id, char *mes, int len, int sfd) { +int HP_mapif_guild_message(int guild_id, int account_id, const char *mes, int len, int sfd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_message_pre ) { - int (*preHookFunc) (int *guild_id, int *account_id, char *mes, int *len, int *sfd); + int (*preHookFunc) (int *guild_id, int *account_id, const char *mes, int *len, int *sfd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_message_pre[hIndex].func; @@ -11112,7 +11436,7 @@ int HP_mapif_guild_message(int guild_id, int account_id, char *mes, int len, int retVal___ = HPMHooks.source.mapif.guild_message(guild_id, account_id, mes, len, sfd); } if( HPMHooks.count.HP_mapif_guild_message_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, char *mes, int *len, int *sfd); + int (*postHookFunc) (int retVal___, int *guild_id, int *account_id, const char *mes, int *len, int *sfd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, &guild_id, &account_id, mes, &len, &sfd); @@ -11336,11 +11660,11 @@ int HP_mapif_guild_master_changed(struct guild *g, int aid, int cid) { } return retVal___; } -int HP_mapif_guild_castle_dataload(int fd, int sz, int *castle_ids) { +int HP_mapif_guild_castle_dataload(int fd, int sz, const int *castle_ids) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_guild_castle_dataload_pre ) { - int (*preHookFunc) (int *fd, int *sz, int *castle_ids); + int (*preHookFunc) (int *fd, int *sz, const int *castle_ids); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_castle_dataload_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_guild_castle_dataload_pre[hIndex].func; @@ -11355,7 +11679,7 @@ int HP_mapif_guild_castle_dataload(int fd, int sz, int *castle_ids) { retVal___ = HPMHooks.source.mapif.guild_castle_dataload(fd, sz, castle_ids); } if( HPMHooks.count.HP_mapif_guild_castle_dataload_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *sz, int *castle_ids); + int (*postHookFunc) (int retVal___, int *fd, int *sz, const int *castle_ids); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_guild_castle_dataload_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_guild_castle_dataload_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &sz, castle_ids); @@ -11363,11 +11687,11 @@ int HP_mapif_guild_castle_dataload(int fd, int sz, int *castle_ids) { } return retVal___; } -int HP_mapif_parse_CreateGuild(int fd, int account_id, char *name, struct guild_member *master) { +int HP_mapif_parse_CreateGuild(int fd, int account_id, const char *name, const struct guild_member *master) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_CreateGuild_pre ) { - int (*preHookFunc) (int *fd, int *account_id, char *name, struct guild_member *master); + int (*preHookFunc) (int *fd, int *account_id, const char *name, const struct guild_member *master); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateGuild_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_CreateGuild_pre[hIndex].func; @@ -11382,7 +11706,7 @@ int HP_mapif_parse_CreateGuild(int fd, int account_id, char *name, struct guild_ retVal___ = HPMHooks.source.mapif.parse_CreateGuild(fd, account_id, name, master); } if( HPMHooks.count.HP_mapif_parse_CreateGuild_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, char *name, struct guild_member *master); + int (*postHookFunc) (int retVal___, int *fd, int *account_id, const char *name, const struct guild_member *master); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateGuild_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_CreateGuild_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &account_id, name, master); @@ -11417,11 +11741,11 @@ int HP_mapif_parse_GuildInfo(int fd, int guild_id) { } return retVal___; } -int HP_mapif_parse_GuildAddMember(int fd, int guild_id, struct guild_member *m) { +int HP_mapif_parse_GuildAddMember(int fd, int guild_id, const struct guild_member *m) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildAddMember_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, struct guild_member *m); + int (*preHookFunc) (int *fd, int *guild_id, const struct guild_member *m); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildAddMember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildAddMember_pre[hIndex].func; @@ -11436,7 +11760,7 @@ int HP_mapif_parse_GuildAddMember(int fd, int guild_id, struct guild_member *m) retVal___ = HPMHooks.source.mapif.parse_GuildAddMember(fd, guild_id, m); } if( HPMHooks.count.HP_mapif_parse_GuildAddMember_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, struct guild_member *m); + int (*postHookFunc) (int retVal___, int *fd, int *guild_id, const struct guild_member *m); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildAddMember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildAddMember_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &guild_id, m); @@ -11525,11 +11849,11 @@ int HP_mapif_parse_BreakGuild(int fd, int guild_id) { } return retVal___; } -int HP_mapif_parse_GuildMessage(int fd, int guild_id, int account_id, char *mes, int len) { +int HP_mapif_parse_GuildMessage(int fd, int guild_id, int account_id, const char *mes, int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildMessage_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *account_id, char *mes, int *len); + int (*preHookFunc) (int *fd, int *guild_id, int *account_id, const char *mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildMessage_pre[hIndex].func; @@ -11544,7 +11868,7 @@ int HP_mapif_parse_GuildMessage(int fd, int guild_id, int account_id, char *mes, retVal___ = HPMHooks.source.mapif.parse_GuildMessage(fd, guild_id, account_id, mes, len); } if( HPMHooks.count.HP_mapif_parse_GuildMessage_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, char *mes, int *len); + int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *account_id, const char *mes, int *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildMessage_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &guild_id, &account_id, mes, &len); @@ -11606,11 +11930,11 @@ int HP_mapif_parse_GuildMemberInfoChange(int fd, int guild_id, int account_id, i } return retVal___; } -int HP_mapif_parse_GuildPosition(int fd, int guild_id, int idx, struct guild_position *p) { +int HP_mapif_parse_GuildPosition(int fd, int guild_id, int idx, const struct guild_position *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildPosition_pre ) { - int (*preHookFunc) (int *fd, int *guild_id, int *idx, struct guild_position *p); + int (*preHookFunc) (int *fd, int *guild_id, int *idx, const struct guild_position *p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildPosition_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildPosition_pre[hIndex].func; @@ -11625,7 +11949,7 @@ int HP_mapif_parse_GuildPosition(int fd, int guild_id, int idx, struct guild_pos retVal___ = HPMHooks.source.mapif.parse_GuildPosition(fd, guild_id, idx, p); } if( HPMHooks.count.HP_mapif_parse_GuildPosition_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *idx, struct guild_position *p); + int (*postHookFunc) (int retVal___, int *fd, int *guild_id, int *idx, const struct guild_position *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildPosition_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildPosition_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &guild_id, &idx, p); @@ -11768,11 +12092,11 @@ int HP_mapif_parse_GuildEmblem(int fd, int len, int guild_id, int dummy, const c } return retVal___; } -int HP_mapif_parse_GuildCastleDataLoad(int fd, int len, int *castle_ids) { +int HP_mapif_parse_GuildCastleDataLoad(int fd, int len, const int *castle_ids) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_pre ) { - int (*preHookFunc) (int *fd, int *len, int *castle_ids); + int (*preHookFunc) (int *fd, int *len, const int *castle_ids); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_GuildCastleDataLoad_pre[hIndex].func; @@ -11787,7 +12111,7 @@ int HP_mapif_parse_GuildCastleDataLoad(int fd, int len, int *castle_ids) { retVal___ = HPMHooks.source.mapif.parse_GuildCastleDataLoad(fd, len, castle_ids); } if( HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *len, int *castle_ids); + int (*postHookFunc) (int retVal___, int *fd, int *len, const int *castle_ids); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_GuildCastleDataLoad_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_GuildCastleDataLoad_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &len, castle_ids); @@ -11849,10 +12173,10 @@ int HP_mapif_parse_GuildMasterChange(int fd, int guild_id, const char *name, int } return retVal___; } -void HP_mapif_homunculus_created(int fd, int account_id, struct s_homunculus *sh, unsigned char flag) { +void HP_mapif_homunculus_created(int fd, int account_id, const struct s_homunculus *sh, unsigned char flag) { int hIndex = 0; if( HPMHooks.count.HP_mapif_homunculus_created_pre ) { - void (*preHookFunc) (int *fd, int *account_id, struct s_homunculus *sh, unsigned char *flag); + void (*preHookFunc) (int *fd, int *account_id, const struct s_homunculus *sh, unsigned char *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_created_pre[hIndex].func; @@ -11867,7 +12191,7 @@ void HP_mapif_homunculus_created(int fd, int account_id, struct s_homunculus *sh HPMHooks.source.mapif.homunculus_created(fd, account_id, sh, flag); } if( HPMHooks.count.HP_mapif_homunculus_created_post ) { - void (*postHookFunc) (int *fd, int *account_id, struct s_homunculus *sh, unsigned char *flag); + void (*postHookFunc) (int *fd, int *account_id, const struct s_homunculus *sh, unsigned char *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_created_post[hIndex].func; postHookFunc(&fd, &account_id, sh, &flag); @@ -11953,10 +12277,10 @@ void HP_mapif_homunculus_saved(int fd, int account_id, bool flag) { } return; } -void HP_mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned char flag, char *name) { +void HP_mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned char flag, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_mapif_homunculus_renamed_pre ) { - void (*preHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, char *name); + void (*preHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_renamed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_renamed_pre[hIndex].func; @@ -11971,7 +12295,7 @@ void HP_mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned c HPMHooks.source.mapif.homunculus_renamed(fd, account_id, char_id, flag, name); } if( HPMHooks.count.HP_mapif_homunculus_renamed_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, char *name); + void (*postHookFunc) (int *fd, int *account_id, int *char_id, unsigned char *flag, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_renamed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_renamed_post[hIndex].func; postHookFunc(&fd, &account_id, &char_id, &flag, name); @@ -11979,12 +12303,39 @@ void HP_mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned c } return; } -bool HP_mapif_homunculus_save(struct s_homunculus *hd) { +bool HP_mapif_homunculus_create(struct s_homunculus *hd) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_mapif_homunculus_save_pre ) { + if( HPMHooks.count.HP_mapif_homunculus_create_pre ) { bool (*preHookFunc) (struct s_homunculus *hd); *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_create_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_mapif_homunculus_create_pre[hIndex].func; + retVal___ = preHookFunc(hd); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.mapif.homunculus_create(hd); + } + if( HPMHooks.count.HP_mapif_homunculus_create_post ) { + bool (*postHookFunc) (bool retVal___, struct s_homunculus *hd); + for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_create_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_mapif_homunculus_create_post[hIndex].func; + retVal___ = postHookFunc(retVal___, hd); + } + } + return retVal___; +} +bool HP_mapif_homunculus_save(const struct s_homunculus *hd) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_mapif_homunculus_save_pre ) { + bool (*preHookFunc) (const struct s_homunculus *hd); + *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_save_pre[hIndex].func; retVal___ = preHookFunc(hd); @@ -11998,7 +12349,7 @@ bool HP_mapif_homunculus_save(struct s_homunculus *hd) { retVal___ = HPMHooks.source.mapif.homunculus_save(hd); } if( HPMHooks.count.HP_mapif_homunculus_save_post ) { - bool (*postHookFunc) (bool retVal___, struct s_homunculus *hd); + bool (*postHookFunc) (bool retVal___, const struct s_homunculus *hd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_save_post[hIndex].func; retVal___ = postHookFunc(retVal___, hd); @@ -12060,11 +12411,11 @@ bool HP_mapif_homunculus_delete(int homun_id) { } return retVal___; } -bool HP_mapif_homunculus_rename(char *name) { +bool HP_mapif_homunculus_rename(const char *name) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_mapif_homunculus_rename_pre ) { - bool (*preHookFunc) (char *name); + bool (*preHookFunc) (const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_rename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_homunculus_rename_pre[hIndex].func; @@ -12079,7 +12430,7 @@ bool HP_mapif_homunculus_rename(char *name) { retVal___ = HPMHooks.source.mapif.homunculus_rename(name); } if( HPMHooks.count.HP_mapif_homunculus_rename_post ) { - bool (*postHookFunc) (bool retVal___, char *name); + bool (*postHookFunc) (bool retVal___, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_homunculus_rename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_homunculus_rename_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -12087,10 +12438,10 @@ bool HP_mapif_homunculus_rename(char *name) { } return retVal___; } -void HP_mapif_parse_homunculus_create(int fd, int len, int account_id, struct s_homunculus *phd) { +void HP_mapif_parse_homunculus_create(int fd, int len, int account_id, const struct s_homunculus *phd) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_homunculus_create_pre ) { - void (*preHookFunc) (int *fd, int *len, int *account_id, struct s_homunculus *phd); + void (*preHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_create_pre[hIndex].func; @@ -12105,7 +12456,7 @@ void HP_mapif_parse_homunculus_create(int fd, int len, int account_id, struct s_ HPMHooks.source.mapif.parse_homunculus_create(fd, len, account_id, phd); } if( HPMHooks.count.HP_mapif_parse_homunculus_create_post ) { - void (*postHookFunc) (int *fd, int *len, int *account_id, struct s_homunculus *phd); + void (*postHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_create_post[hIndex].func; postHookFunc(&fd, &len, &account_id, phd); @@ -12165,10 +12516,10 @@ void HP_mapif_parse_homunculus_load(int fd, int account_id, int homun_id) { } return; } -void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, struct s_homunculus *phd) { +void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, const struct s_homunculus *phd) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_homunculus_save_pre ) { - void (*preHookFunc) (int *fd, int *len, int *account_id, struct s_homunculus *phd); + void (*preHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_save_pre[hIndex].func; @@ -12183,7 +12534,7 @@ void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, struct s_ho HPMHooks.source.mapif.parse_homunculus_save(fd, len, account_id, phd); } if( HPMHooks.count.HP_mapif_parse_homunculus_save_post ) { - void (*postHookFunc) (int *fd, int *len, int *account_id, struct s_homunculus *phd); + void (*postHookFunc) (int *fd, int *len, int *account_id, const struct s_homunculus *phd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_save_post[hIndex].func; postHookFunc(&fd, &len, &account_id, phd); @@ -12191,10 +12542,10 @@ void HP_mapif_parse_homunculus_save(int fd, int len, int account_id, struct s_ho } return; } -void HP_mapif_parse_homunculus_rename(int fd, int account_id, int char_id, char *name) { +void HP_mapif_parse_homunculus_rename(int fd, int account_id, int char_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_homunculus_rename_pre ) { - void (*preHookFunc) (int *fd, int *account_id, int *char_id, char *name); + void (*preHookFunc) (int *fd, int *account_id, int *char_id, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_rename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_rename_pre[hIndex].func; @@ -12209,7 +12560,7 @@ void HP_mapif_parse_homunculus_rename(int fd, int account_id, int char_id, char HPMHooks.source.mapif.parse_homunculus_rename(fd, account_id, char_id, name); } if( HPMHooks.count.HP_mapif_parse_homunculus_rename_post ) { - void (*postHookFunc) (int *fd, int *account_id, int *char_id, char *name); + void (*postHookFunc) (int *fd, int *account_id, int *char_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_homunculus_rename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_homunculus_rename_post[hIndex].func; postHookFunc(&fd, &account_id, &char_id, name); @@ -12555,12 +12906,39 @@ void HP_mapif_parse_mail_send(int fd) { } return; } -bool HP_mapif_mercenary_save(struct s_mercenary *merc) { +bool HP_mapif_mercenary_create(struct s_mercenary *merc) { int hIndex = 0; bool retVal___ = false; - if( HPMHooks.count.HP_mapif_mercenary_save_pre ) { + if( HPMHooks.count.HP_mapif_mercenary_create_pre ) { bool (*preHookFunc) (struct s_mercenary *merc); *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_create_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_mapif_mercenary_create_pre[hIndex].func; + retVal___ = preHookFunc(merc); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.mapif.mercenary_create(merc); + } + if( HPMHooks.count.HP_mapif_mercenary_create_post ) { + bool (*postHookFunc) (bool retVal___, struct s_mercenary *merc); + for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_create_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_mapif_mercenary_create_post[hIndex].func; + retVal___ = postHookFunc(retVal___, merc); + } + } + return retVal___; +} +bool HP_mapif_mercenary_save(const struct s_mercenary *merc) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_mapif_mercenary_save_pre ) { + bool (*preHookFunc) (const struct s_mercenary *merc); + *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_mercenary_save_pre[hIndex].func; retVal___ = preHookFunc(merc); @@ -12574,7 +12952,7 @@ bool HP_mapif_mercenary_save(struct s_mercenary *merc) { retVal___ = HPMHooks.source.mapif.mercenary_save(merc); } if( HPMHooks.count.HP_mapif_mercenary_save_post ) { - bool (*postHookFunc) (bool retVal___, struct s_mercenary *merc); + bool (*postHookFunc) (bool retVal___, const struct s_mercenary *merc); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_mercenary_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_mercenary_save_post[hIndex].func; retVal___ = postHookFunc(retVal___, merc); @@ -12662,10 +13040,10 @@ void HP_mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char fla } return; } -void HP_mapif_parse_mercenary_create(int fd, struct s_mercenary *merc) { +void HP_mapif_parse_mercenary_create(int fd, const struct s_mercenary *merc) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_mercenary_create_pre ) { - void (*preHookFunc) (int *fd, struct s_mercenary *merc); + void (*preHookFunc) (int *fd, const struct s_mercenary *merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_create_pre[hIndex].func; @@ -12680,7 +13058,7 @@ void HP_mapif_parse_mercenary_create(int fd, struct s_mercenary *merc) { HPMHooks.source.mapif.parse_mercenary_create(fd, merc); } if( HPMHooks.count.HP_mapif_parse_mercenary_create_post ) { - void (*postHookFunc) (int *fd, struct s_mercenary *merc); + void (*postHookFunc) (int *fd, const struct s_mercenary *merc); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_create_post[hIndex].func; postHookFunc(&fd, merc); @@ -12792,10 +13170,10 @@ void HP_mapif_mercenary_saved(int fd, unsigned char flag) { } return; } -void HP_mapif_parse_mercenary_save(int fd, struct s_mercenary *merc) { +void HP_mapif_parse_mercenary_save(int fd, const struct s_mercenary *merc) { int hIndex = 0; if( HPMHooks.count.HP_mapif_parse_mercenary_save_pre ) { - void (*preHookFunc) (int *fd, struct s_mercenary *merc); + void (*preHookFunc) (int *fd, const struct s_mercenary *merc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_save_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_save_pre[hIndex].func; @@ -12810,7 +13188,7 @@ void HP_mapif_parse_mercenary_save(int fd, struct s_mercenary *merc) { HPMHooks.source.mapif.parse_mercenary_save(fd, merc); } if( HPMHooks.count.HP_mapif_parse_mercenary_save_post ) { - void (*postHookFunc) (int *fd, struct s_mercenary *merc); + void (*postHookFunc) (int *fd, const struct s_mercenary *merc); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_mercenary_save_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_mercenary_save_post[hIndex].func; postHookFunc(&fd, merc); @@ -13032,11 +13410,11 @@ int HP_mapif_party_broken(int party_id, int flag) { } return retVal___; } -int HP_mapif_party_message(int party_id, int account_id, char *mes, int len, int sfd) { +int HP_mapif_party_message(int party_id, int account_id, const char *mes, int len, int sfd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_party_message_pre ) { - int (*preHookFunc) (int *party_id, int *account_id, char *mes, int *len, int *sfd); + int (*preHookFunc) (int *party_id, int *account_id, const char *mes, int *len, int *sfd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_party_message_pre[hIndex].func; @@ -13051,7 +13429,7 @@ int HP_mapif_party_message(int party_id, int account_id, char *mes, int len, int retVal___ = HPMHooks.source.mapif.party_message(party_id, account_id, mes, len, sfd); } if( HPMHooks.count.HP_mapif_party_message_post ) { - int (*postHookFunc) (int retVal___, int *party_id, int *account_id, char *mes, int *len, int *sfd); + int (*postHookFunc) (int retVal___, int *party_id, int *account_id, const char *mes, int *len, int *sfd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_party_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_party_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, &party_id, &account_id, mes, &len, &sfd); @@ -13059,11 +13437,11 @@ int HP_mapif_party_message(int party_id, int account_id, char *mes, int len, int } return retVal___; } -int HP_mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct party_member *leader) { +int HP_mapif_parse_CreateParty(int fd, const char *name, int item, int item2, const struct party_member *leader) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_CreateParty_pre ) { - int (*preHookFunc) (int *fd, char *name, int *item, int *item2, struct party_member *leader); + int (*preHookFunc) (int *fd, const char *name, int *item, int *item2, const struct party_member *leader); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateParty_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_CreateParty_pre[hIndex].func; @@ -13078,7 +13456,7 @@ int HP_mapif_parse_CreateParty(int fd, char *name, int item, int item2, struct p retVal___ = HPMHooks.source.mapif.parse_CreateParty(fd, name, item, item2, leader); } if( HPMHooks.count.HP_mapif_parse_CreateParty_post ) { - int (*postHookFunc) (int retVal___, int *fd, char *name, int *item, int *item2, struct party_member *leader); + int (*postHookFunc) (int retVal___, int *fd, const char *name, int *item, int *item2, const struct party_member *leader); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_CreateParty_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_CreateParty_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, name, &item, &item2, leader); @@ -13112,11 +13490,11 @@ void HP_mapif_parse_PartyInfo(int fd, int party_id, int char_id) { } return; } -int HP_mapif_parse_PartyAddMember(int fd, int party_id, struct party_member *member) { +int HP_mapif_parse_PartyAddMember(int fd, int party_id, const struct party_member *member) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_PartyAddMember_pre ) { - int (*preHookFunc) (int *fd, int *party_id, struct party_member *member); + int (*preHookFunc) (int *fd, int *party_id, const struct party_member *member); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyAddMember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_PartyAddMember_pre[hIndex].func; @@ -13131,7 +13509,7 @@ int HP_mapif_parse_PartyAddMember(int fd, int party_id, struct party_member *mem retVal___ = HPMHooks.source.mapif.parse_PartyAddMember(fd, party_id, member); } if( HPMHooks.count.HP_mapif_parse_PartyAddMember_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, struct party_member *member); + int (*postHookFunc) (int retVal___, int *fd, int *party_id, const struct party_member *member); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyAddMember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyAddMember_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &party_id, member); @@ -13247,11 +13625,11 @@ int HP_mapif_parse_BreakParty(int fd, int party_id) { } return retVal___; } -int HP_mapif_parse_PartyMessage(int fd, int party_id, int account_id, char *mes, int len) { +int HP_mapif_parse_PartyMessage(int fd, int party_id, int account_id, const char *mes, int len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_parse_PartyMessage_pre ) { - int (*preHookFunc) (int *fd, int *party_id, int *account_id, char *mes, int *len); + int (*preHookFunc) (int *fd, int *party_id, int *account_id, const char *mes, int *len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyMessage_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_parse_PartyMessage_pre[hIndex].func; @@ -13266,7 +13644,7 @@ int HP_mapif_parse_PartyMessage(int fd, int party_id, int account_id, char *mes, retVal___ = HPMHooks.source.mapif.parse_PartyMessage(fd, party_id, account_id, mes, len); } if( HPMHooks.count.HP_mapif_parse_PartyMessage_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, char *mes, int *len); + int (*postHookFunc) (int retVal___, int *fd, int *party_id, int *account_id, const char *mes, int *len); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_parse_PartyMessage_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_parse_PartyMessage_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &party_id, &account_id, mes, &len); @@ -13436,11 +13814,11 @@ int HP_mapif_delete_pet_ack(int fd, int flag) { } return retVal___; } -int HP_mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name) { +int HP_mapif_create_pet(int fd, int account_id, int char_id, short pet_class, short pet_lv, short pet_egg_id, short pet_equip, short intimate, short hungry, char rename_flag, char incubate, const char *pet_name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_create_pet_pre ) { - int (*preHookFunc) (int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char *pet_name); + int (*preHookFunc) (int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char *pet_name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_create_pet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_create_pet_pre[hIndex].func; @@ -13455,7 +13833,7 @@ int HP_mapif_create_pet(int fd, int account_id, int char_id, short pet_class, sh retVal___ = HPMHooks.source.mapif.create_pet(fd, account_id, char_id, pet_class, pet_lv, pet_egg_id, pet_equip, intimate, hungry, rename_flag, incubate, pet_name); } if( HPMHooks.count.HP_mapif_create_pet_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, char *pet_name); + int (*postHookFunc) (int retVal___, int *fd, int *account_id, int *char_id, short *pet_class, short *pet_lv, short *pet_egg_id, short *pet_equip, short *intimate, short *hungry, char *rename_flag, char *incubate, const char *pet_name); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_create_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_create_pet_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &account_id, &char_id, &pet_class, &pet_lv, &pet_egg_id, &pet_equip, &intimate, &hungry, &rename_flag, &incubate, pet_name); @@ -13490,11 +13868,11 @@ int HP_mapif_load_pet(int fd, int account_id, int char_id, int pet_id) { } return retVal___; } -int HP_mapif_save_pet(int fd, int account_id, struct s_pet *data) { +int HP_mapif_save_pet(int fd, int account_id, const struct s_pet *data) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_save_pet_pre ) { - int (*preHookFunc) (int *fd, int *account_id, struct s_pet *data); + int (*preHookFunc) (int *fd, int *account_id, const struct s_pet *data); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_save_pet_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_save_pet_pre[hIndex].func; @@ -13509,7 +13887,7 @@ int HP_mapif_save_pet(int fd, int account_id, struct s_pet *data) { retVal___ = HPMHooks.source.mapif.save_pet(fd, account_id, data); } if( HPMHooks.count.HP_mapif_save_pet_post ) { - int (*postHookFunc) (int retVal___, int *fd, int *account_id, struct s_pet *data); + int (*postHookFunc) (int retVal___, int *fd, int *account_id, const struct s_pet *data); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_save_pet_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_save_pet_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd, &account_id, data); @@ -14106,11 +14484,11 @@ void HP_mapif_parse_accinfo2(bool success, int map_fd, int u_fd, int u_aid, int } return; } -int HP_mapif_broadcast(unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd) { +int HP_mapif_broadcast(const unsigned char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, int sfd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mapif_broadcast_pre ) { - int (*preHookFunc) (unsigned char *mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); + int (*preHookFunc) (const unsigned char *mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_broadcast_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_broadcast_pre[hIndex].func; @@ -14125,7 +14503,7 @@ int HP_mapif_broadcast(unsigned char *mes, int len, unsigned int fontColor, shor retVal___ = HPMHooks.source.mapif.broadcast(mes, len, fontColor, fontType, fontSize, fontAlign, fontY, sfd); } if( HPMHooks.count.HP_mapif_broadcast_post ) { - int (*postHookFunc) (int retVal___, unsigned char *mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); + int (*postHookFunc) (int retVal___, const unsigned char *mes, int *len, unsigned int *fontColor, short *fontType, short *fontSize, short *fontAlign, short *fontY, int *sfd); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_broadcast_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_broadcast_post[hIndex].func; retVal___ = postHookFunc(retVal___, mes, &len, &fontColor, &fontType, &fontSize, &fontAlign, &fontY, &sfd); @@ -14160,10 +14538,10 @@ int HP_mapif_wis_message(struct WisData *wd) { } return retVal___; } -void HP_mapif_wis_response(int fd, unsigned char *src, int flag) { +void HP_mapif_wis_response(int fd, const unsigned char *src, int flag) { int hIndex = 0; if( HPMHooks.count.HP_mapif_wis_response_pre ) { - void (*preHookFunc) (int *fd, unsigned char *src, int *flag); + void (*preHookFunc) (int *fd, const unsigned char *src, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_response_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mapif_wis_response_pre[hIndex].func; @@ -14178,7 +14556,7 @@ void HP_mapif_wis_response(int fd, unsigned char *src, int flag) { HPMHooks.source.mapif.wis_response(fd, src, flag); } if( HPMHooks.count.HP_mapif_wis_response_post ) { - void (*postHookFunc) (int *fd, unsigned char *src, int *flag); + void (*postHookFunc) (int *fd, const unsigned char *src, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mapif_wis_response_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mapif_wis_response_post[hIndex].func; postHookFunc(&fd, src, &flag); @@ -15820,11 +16198,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 +16217,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); @@ -17857,6 +18235,33 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } +const char* HP_sysinfo_time(void) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_sysinfo_time_pre ) { + const char* (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; + retVal___ = preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.sysinfo.time(); + } + if( HPMHooks.count.HP_sysinfo_time_post ) { + const char* (*postHookFunc) (const char* retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; + retVal___ = postHookFunc(retVal___); + } + } + return retVal___; +} const char* HP_sysinfo_vcstype(void) { int hIndex = 0; const char* retVal___ = NULL; diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc index ce78fdd7e..67257883f 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; @@ -332,6 +352,8 @@ struct { struct HPMHookPoint *HP_iMalloc_reallocz_post; struct HPMHookPoint *HP_iMalloc_astrdup_pre; struct HPMHookPoint *HP_iMalloc_astrdup_post; + struct HPMHookPoint *HP_iMalloc_astrndup_pre; + struct HPMHookPoint *HP_iMalloc_astrndup_post; struct HPMHookPoint *HP_iMalloc_free_pre; struct HPMHookPoint *HP_iMalloc_free_post; struct HPMHookPoint *HP_iMalloc_memory_check_pre; @@ -556,6 +578,8 @@ struct { struct HPMHookPoint *HP_sysinfo_compiler_post; struct HPMHookPoint *HP_sysinfo_cflags_pre; struct HPMHookPoint *HP_sysinfo_cflags_post; + struct HPMHookPoint *HP_sysinfo_time_pre; + struct HPMHookPoint *HP_sysinfo_time_post; struct HPMHookPoint *HP_sysinfo_vcstype_pre; struct HPMHookPoint *HP_sysinfo_vcstype_post; struct HPMHookPoint *HP_sysinfo_vcstypeid_pre; @@ -671,10 +695,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; @@ -699,6 +723,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; @@ -761,8 +787,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; @@ -773,8 +797,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; @@ -783,6 +807,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; @@ -909,6 +953,8 @@ struct { int HP_iMalloc_reallocz_post; int HP_iMalloc_astrdup_pre; int HP_iMalloc_astrdup_post; + int HP_iMalloc_astrndup_pre; + int HP_iMalloc_astrndup_post; int HP_iMalloc_free_pre; int HP_iMalloc_free_post; int HP_iMalloc_memory_check_pre; @@ -1133,6 +1179,8 @@ struct { int HP_sysinfo_compiler_post; int HP_sysinfo_cflags_pre; int HP_sysinfo_cflags_post; + int HP_sysinfo_time_pre; + int HP_sysinfo_time_post; int HP_sysinfo_vcstype_pre; int HP_sysinfo_vcstype_post; int HP_sysinfo_vcstypeid_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc index 5be52d51e..0460f4ca4 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) }, @@ -185,6 +195,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(iMalloc->realloc, HP_iMalloc_realloc) }, { HP_POP(iMalloc->reallocz, HP_iMalloc_reallocz) }, { HP_POP(iMalloc->astrdup, HP_iMalloc_astrdup) }, + { HP_POP(iMalloc->astrndup, HP_iMalloc_astrndup) }, { HP_POP(iMalloc->free, HP_iMalloc_free) }, { HP_POP(iMalloc->memory_check, HP_iMalloc_memory_check) }, { HP_POP(iMalloc->verify_ptr, HP_iMalloc_verify_ptr) }, @@ -305,6 +316,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sysinfo->is64bit, HP_sysinfo_is64bit) }, { HP_POP(sysinfo->compiler, HP_sysinfo_compiler) }, { HP_POP(sysinfo->cflags, HP_sysinfo_cflags) }, + { HP_POP(sysinfo->time, HP_sysinfo_time) }, { HP_POP(sysinfo->vcstype, HP_sysinfo_vcstype) }, { HP_POP(sysinfo->vcstypeid, HP_sysinfo_vcstypeid) }, { HP_POP(sysinfo->vcsrevision_src, HP_sysinfo_vcsrevision_src) }, diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc index 670083e94..c647ca3e1 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; @@ -4155,6 +4425,33 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * } return retVal___; } +char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line, const char *func) { + int hIndex = 0; + char* retVal___ = NULL; + if( HPMHooks.count.HP_iMalloc_astrndup_pre ) { + char* (*preHookFunc) (const char *p, size_t *size, const char *file, int *line, const char *func); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_iMalloc_astrndup_pre[hIndex].func; + retVal___ = preHookFunc(p, &size, file, &line, func); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.iMalloc.astrndup(p, size, file, line, func); + } + if( HPMHooks.count.HP_iMalloc_astrndup_post ) { + char* (*postHookFunc) (char* retVal___, const char *p, size_t *size, const char *file, int *line, const char *func); + for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_iMalloc_astrndup_post[hIndex].func; + retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + } + } + return retVal___; +} void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_free_pre ) { @@ -5146,11 +5443,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 +5462,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); @@ -7183,6 +7480,33 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } +const char* HP_sysinfo_time(void) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_sysinfo_time_pre ) { + const char* (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; + retVal___ = preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.sysinfo.time(); + } + if( HPMHooks.count.HP_sysinfo_time_post ) { + const char* (*postHookFunc) (const char* retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; + retVal___ = postHookFunc(retVal___); + } + } + return retVal___; +} const char* HP_sysinfo_vcstype(void) { int hIndex = 0; const char* retVal___ = NULL; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index d909e9892..e5457e47c 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -2670,6 +2670,8 @@ struct { struct HPMHookPoint *HP_itemdb_searchrandomid_post; struct HPMHookPoint *HP_itemdb_typename_pre; struct HPMHookPoint *HP_itemdb_typename_post; + struct HPMHookPoint *HP_itemdb_jobmask2mapid_pre; + struct HPMHookPoint *HP_itemdb_jobmask2mapid_post; struct HPMHookPoint *HP_itemdb_jobid2mapid_pre; struct HPMHookPoint *HP_itemdb_jobid2mapid_post; struct HPMHookPoint *HP_itemdb_create_dummy_data_pre; @@ -2718,6 +2720,8 @@ struct { struct HPMHookPoint *HP_itemdb_validate_entry_post; struct HPMHookPoint *HP_itemdb_readdb_additional_fields_pre; struct HPMHookPoint *HP_itemdb_readdb_additional_fields_post; + struct HPMHookPoint *HP_itemdb_readdb_job_sub_pre; + struct HPMHookPoint *HP_itemdb_readdb_job_sub_post; struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_pre; struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_post; struct HPMHookPoint *HP_itemdb_readdb_libconfig_pre; @@ -2742,10 +2746,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 +2774,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 +2838,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 +2848,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 +2858,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; @@ -2930,6 +2954,8 @@ struct { struct HPMHookPoint *HP_iMalloc_reallocz_post; struct HPMHookPoint *HP_iMalloc_astrdup_pre; struct HPMHookPoint *HP_iMalloc_astrdup_post; + struct HPMHookPoint *HP_iMalloc_astrndup_pre; + struct HPMHookPoint *HP_iMalloc_astrndup_post; struct HPMHookPoint *HP_iMalloc_free_pre; struct HPMHookPoint *HP_iMalloc_free_post; struct HPMHookPoint *HP_iMalloc_memory_check_pre; @@ -3480,6 +3506,8 @@ struct { struct HPMHookPoint *HP_mob_lookup_const_post; struct HPMHookPoint *HP_mob_get_const_pre; struct HPMHookPoint *HP_mob_get_const_post; + struct HPMHookPoint *HP_mob_db_validate_entry_pre; + struct HPMHookPoint *HP_mob_db_validate_entry_post; struct HPMHookPoint *HP_mob_read_libconfig_pre; struct HPMHookPoint *HP_mob_read_libconfig_post; struct HPMHookPoint *HP_mob_read_db_additional_fields_pre; @@ -4628,6 +4656,8 @@ struct { struct HPMHookPoint *HP_script_parse_line_post; struct HPMHookPoint *HP_script_read_constdb_pre; struct HPMHookPoint *HP_script_read_constdb_post; + struct HPMHookPoint *HP_script_constdb_comment_pre; + struct HPMHookPoint *HP_script_constdb_comment_post; struct HPMHookPoint *HP_script_print_line_pre; struct HPMHookPoint *HP_script_print_line_post; struct HPMHookPoint *HP_script_errorwarning_sub_pre; @@ -5694,6 +5724,8 @@ struct { struct HPMHookPoint *HP_sysinfo_compiler_post; struct HPMHookPoint *HP_sysinfo_cflags_pre; struct HPMHookPoint *HP_sysinfo_cflags_post; + struct HPMHookPoint *HP_sysinfo_time_pre; + struct HPMHookPoint *HP_sysinfo_time_post; struct HPMHookPoint *HP_sysinfo_vcstype_pre; struct HPMHookPoint *HP_sysinfo_vcstype_post; struct HPMHookPoint *HP_sysinfo_vcstypeid_pre; @@ -8515,6 +8547,8 @@ struct { int HP_itemdb_searchrandomid_post; int HP_itemdb_typename_pre; int HP_itemdb_typename_post; + int HP_itemdb_jobmask2mapid_pre; + int HP_itemdb_jobmask2mapid_post; int HP_itemdb_jobid2mapid_pre; int HP_itemdb_jobid2mapid_post; int HP_itemdb_create_dummy_data_pre; @@ -8563,6 +8597,8 @@ struct { int HP_itemdb_validate_entry_post; int HP_itemdb_readdb_additional_fields_pre; int HP_itemdb_readdb_additional_fields_post; + int HP_itemdb_readdb_job_sub_pre; + int HP_itemdb_readdb_job_sub_post; int HP_itemdb_readdb_libconfig_sub_pre; int HP_itemdb_readdb_libconfig_sub_post; int HP_itemdb_readdb_libconfig_pre; @@ -8587,10 +8623,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; @@ -8615,6 +8651,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; @@ -8677,8 +8715,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; @@ -8689,8 +8725,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; @@ -8699,6 +8735,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; @@ -8775,6 +8831,8 @@ struct { int HP_iMalloc_reallocz_post; int HP_iMalloc_astrdup_pre; int HP_iMalloc_astrdup_post; + int HP_iMalloc_astrndup_pre; + int HP_iMalloc_astrndup_post; int HP_iMalloc_free_pre; int HP_iMalloc_free_post; int HP_iMalloc_memory_check_pre; @@ -9325,6 +9383,8 @@ struct { int HP_mob_lookup_const_post; int HP_mob_get_const_pre; int HP_mob_get_const_post; + int HP_mob_db_validate_entry_pre; + int HP_mob_db_validate_entry_post; int HP_mob_read_libconfig_pre; int HP_mob_read_libconfig_post; int HP_mob_read_db_additional_fields_pre; @@ -10473,6 +10533,8 @@ struct { int HP_script_parse_line_post; int HP_script_read_constdb_pre; int HP_script_read_constdb_post; + int HP_script_constdb_comment_pre; + int HP_script_constdb_comment_post; int HP_script_print_line_pre; int HP_script_print_line_post; int HP_script_errorwarning_sub_pre; @@ -11539,6 +11601,8 @@ struct { int HP_sysinfo_compiler_post; int HP_sysinfo_cflags_pre; int HP_sysinfo_cflags_post; + int HP_sysinfo_time_pre; + int HP_sysinfo_time_post; int HP_sysinfo_vcstype_pre; int HP_sysinfo_vcstype_post; int HP_sysinfo_vcstypeid_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index db30c8c02..365bda5da 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -1368,6 +1368,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(itemdb->searchname_array_sub, HP_itemdb_searchname_array_sub) }, { HP_POP(itemdb->searchrandomid, HP_itemdb_searchrandomid) }, { HP_POP(itemdb->typename, HP_itemdb_typename) }, + { HP_POP(itemdb->jobmask2mapid, HP_itemdb_jobmask2mapid) }, { HP_POP(itemdb->jobid2mapid, HP_itemdb_jobid2mapid) }, { HP_POP(itemdb->create_dummy_data, HP_itemdb_create_dummy_data) }, { HP_POP(itemdb->create_item_data, HP_itemdb_create_item_data) }, @@ -1392,6 +1393,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(itemdb->gendercheck, HP_itemdb_gendercheck) }, { HP_POP(itemdb->validate_entry, HP_itemdb_validate_entry) }, { HP_POP(itemdb->readdb_additional_fields, HP_itemdb_readdb_additional_fields) }, + { HP_POP(itemdb->readdb_job_sub, HP_itemdb_readdb_job_sub) }, { HP_POP(itemdb->readdb_libconfig_sub, HP_itemdb_readdb_libconfig_sub) }, { HP_POP(itemdb->readdb_libconfig, HP_itemdb_readdb_libconfig) }, { HP_POP(itemdb->unique_id, HP_itemdb_unique_id) }, @@ -1405,8 +1407,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 +1421,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 +1453,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) }, @@ -1502,6 +1514,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(iMalloc->realloc, HP_iMalloc_realloc) }, { HP_POP(iMalloc->reallocz, HP_iMalloc_reallocz) }, { HP_POP(iMalloc->astrdup, HP_iMalloc_astrdup) }, + { HP_POP(iMalloc->astrndup, HP_iMalloc_astrndup) }, { HP_POP(iMalloc->free, HP_iMalloc_free) }, { HP_POP(iMalloc->memory_check, HP_iMalloc_memory_check) }, { HP_POP(iMalloc->verify_ptr, HP_iMalloc_verify_ptr) }, @@ -1783,6 +1796,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(mob->readdb, HP_mob_readdb) }, { HP_POP(mob->lookup_const, HP_mob_lookup_const) }, { HP_POP(mob->get_const, HP_mob_get_const) }, + { HP_POP(mob->db_validate_entry, HP_mob_db_validate_entry) }, { HP_POP(mob->read_libconfig, HP_mob_read_libconfig) }, { HP_POP(mob->read_db_additional_fields, HP_mob_read_db_additional_fields) }, { HP_POP(mob->read_db_sub, HP_mob_read_db_sub) }, @@ -2368,6 +2382,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(script->parse_expr, HP_script_parse_expr) }, { HP_POP(script->parse_line, HP_script_parse_line) }, { HP_POP(script->read_constdb, HP_script_read_constdb) }, + { HP_POP(script->constdb_comment, HP_script_constdb_comment) }, { HP_POP(script->print_line, HP_script_print_line) }, { HP_POP(script->errorwarning_sub, HP_script_errorwarning_sub) }, { HP_POP(script->set_reg, HP_script_set_reg) }, @@ -2912,6 +2927,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(sysinfo->is64bit, HP_sysinfo_is64bit) }, { HP_POP(sysinfo->compiler, HP_sysinfo_compiler) }, { HP_POP(sysinfo->cflags, HP_sysinfo_cflags) }, + { HP_POP(sysinfo->time, HP_sysinfo_time) }, { HP_POP(sysinfo->vcstype, HP_sysinfo_vcstype) }, { HP_POP(sysinfo->vcstypeid, HP_sysinfo_vcstypeid) }, { HP_POP(sysinfo->vcsrevision_src, HP_sysinfo_vcsrevision_src) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 11bf66481..f8d5193e1 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); @@ -2633,11 +2633,11 @@ void HP_bg_final(void) { } return; } -struct bg_arena* HP_bg_name2arena(char *name) { +struct bg_arena* HP_bg_name2arena(const char *name) { int hIndex = 0; struct bg_arena* retVal___ = NULL; if( HPMHooks.count.HP_bg_name2arena_pre ) { - struct bg_arena* (*preHookFunc) (char *name); + struct bg_arena* (*preHookFunc) (const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_name2arena_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_bg_name2arena_pre[hIndex].func; @@ -2652,7 +2652,7 @@ struct bg_arena* HP_bg_name2arena(char *name) { retVal___ = HPMHooks.source.bg.name2arena(name); } if( HPMHooks.count.HP_bg_name2arena_post ) { - struct bg_arena* (*postHookFunc) (struct bg_arena* retVal___, char *name); + struct bg_arena* (*postHookFunc) (struct bg_arena* retVal___, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_bg_name2arena_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_bg_name2arena_post[hIndex].func; retVal___ = postHookFunc(retVal___, name); @@ -12820,11 +12820,11 @@ void HP_clif_messageln(const int fd, const char *mes) { } return; } -bool HP_clif_process_message(struct map_session_data *sd, int format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_) { +bool HP_clif_process_message(struct map_session_data *sd, int format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_clif_process_message_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_); + bool (*preHookFunc) (struct map_session_data *sd, int *format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_process_message_pre[hIndex].func; @@ -12839,7 +12839,7 @@ bool HP_clif_process_message(struct map_session_data *sd, int format, char **nam retVal___ = HPMHooks.source.clif.process_message(sd, format, name_, namelen_, message_, messagelen_); } if( HPMHooks.count.HP_clif_process_message_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *format, char **name_, size_t *namelen_, char **message_, size_t *messagelen_); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *format, const char **name_, size_t *namelen_, const char **message_, size_t *messagelen_); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_process_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_process_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &format, name_, namelen_, message_, messagelen_); @@ -16132,10 +16132,10 @@ void HP_clif_auction_openwindow(struct map_session_data *sd) { } return; } -void HP_clif_auction_results(struct map_session_data *sd, short count, short pages, uint8 *buf) { +void HP_clif_auction_results(struct map_session_data *sd, short count, short pages, const uint8 *buf) { int hIndex = 0; if( HPMHooks.count.HP_clif_auction_results_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *count, short *pages, uint8 *buf); + void (*preHookFunc) (struct map_session_data *sd, short *count, short *pages, const uint8 *buf); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_results_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_auction_results_pre[hIndex].func; @@ -16150,7 +16150,7 @@ void HP_clif_auction_results(struct map_session_data *sd, short count, short pag HPMHooks.source.clif.auction_results(sd, count, pages, buf); } if( HPMHooks.count.HP_clif_auction_results_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *count, short *pages, uint8 *buf); + void (*postHookFunc) (struct map_session_data *sd, short *count, short *pages, const uint8 *buf); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_auction_results_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_auction_results_post[hIndex].func; postHookFunc(sd, &count, &pages, buf); @@ -17328,10 +17328,10 @@ void HP_clif_bgqueue_ack(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_A } return; } -void HP_clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED response, char *name) { +void HP_clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED response, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_clif_bgqueue_notice_delete_pre ) { - void (*preHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, char *name); + void (*preHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_notice_delete_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_bgqueue_notice_delete_pre[hIndex].func; @@ -17346,7 +17346,7 @@ void HP_clif_bgqueue_notice_delete(struct map_session_data *sd, enum BATTLEGROUN HPMHooks.source.clif.bgqueue_notice_delete(sd, response, name); } if( HPMHooks.count.HP_clif_bgqueue_notice_delete_post ) { - void (*postHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, char *name); + void (*postHookFunc) (struct map_session_data *sd, enum BATTLEGROUNDS_QUEUE_NOTICE_DELETED *response, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_bgqueue_notice_delete_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_bgqueue_notice_delete_post[hIndex].func; postHookFunc(sd, &response, name); @@ -17903,14 +17903,14 @@ void HP_clif_npc_market_open(struct map_session_data *sd, struct npc_data *nd) { } return; } -void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char response) { +void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, const struct itemlist *item_list, unsigned char response) { int hIndex = 0; if( HPMHooks.count.HP_clif_npc_market_purchase_ack_pre ) { - void (*preHookFunc) (struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char *response); + void (*preHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char *response); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_pre[hIndex].func; - preHookFunc(sd, req, &response); + preHookFunc(sd, item_list, &response); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -17918,13 +17918,13 @@ void HP_clif_npc_market_purchase_ack(struct map_session_data *sd, struct packet_ } } { - HPMHooks.source.clif.npc_market_purchase_ack(sd, req, response); + HPMHooks.source.clif.npc_market_purchase_ack(sd, item_list, response); } if( HPMHooks.count.HP_clif_npc_market_purchase_ack_post ) { - void (*postHookFunc) (struct map_session_data *sd, struct packet_npc_market_purchase *req, unsigned char *response); + void (*postHookFunc) (struct map_session_data *sd, const struct itemlist *item_list, unsigned char *response); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_npc_market_purchase_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_npc_market_purchase_ack_post[hIndex].func; - postHookFunc(sd, req, &response); + postHookFunc(sd, item_list, &response); } } return; @@ -25330,11 +25330,11 @@ int HP_elemental_create(struct map_session_data *sd, int class_, unsigned int li } return retVal___; } -int HP_elemental_data_received(struct s_elemental *ele, bool flag) { +int HP_elemental_data_received(const struct s_elemental *ele, bool flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_data_received_pre ) { - int (*preHookFunc) (struct s_elemental *ele, bool *flag); + int (*preHookFunc) (const struct s_elemental *ele, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_data_received_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_data_received_pre[hIndex].func; @@ -25349,7 +25349,7 @@ int HP_elemental_data_received(struct s_elemental *ele, bool flag) { retVal___ = HPMHooks.source.elemental.data_received(ele, flag); } if( HPMHooks.count.HP_elemental_data_received_post ) { - int (*postHookFunc) (int retVal___, struct s_elemental *ele, bool *flag); + int (*postHookFunc) (int retVal___, const struct s_elemental *ele, bool *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_data_received_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_data_received_post[hIndex].func; retVal___ = postHookFunc(retVal___, ele, &flag); @@ -25411,11 +25411,11 @@ int HP_elemental_change_mode_ack(struct elemental_data *ed, int mode) { } return retVal___; } -int HP_elemental_change_mode(struct elemental_data *ed, int mode) { +int HP_elemental_change_mode(struct elemental_data *ed, uint32 mode) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_elemental_change_mode_pre ) { - int (*preHookFunc) (struct elemental_data *ed, int *mode); + int (*preHookFunc) (struct elemental_data *ed, uint32 *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_change_mode_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_elemental_change_mode_pre[hIndex].func; @@ -25430,7 +25430,7 @@ int HP_elemental_change_mode(struct elemental_data *ed, int mode) { retVal___ = HPMHooks.source.elemental.change_mode(ed, mode); } if( HPMHooks.count.HP_elemental_change_mode_post ) { - int (*postHookFunc) (int retVal___, struct elemental_data *ed, int *mode); + int (*postHookFunc) (int retVal___, struct elemental_data *ed, uint32 *mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_elemental_change_mode_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_elemental_change_mode_post[hIndex].func; retVal___ = postHookFunc(retVal___, ed, &mode); @@ -26417,11 +26417,11 @@ struct map_session_data* HP_guild_getavailablesd(struct guild *g) { } return retVal___; } -int HP_guild_getindex(struct guild *g, int account_id, int char_id) { +int HP_guild_getindex(const struct guild *g, int account_id, int char_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_getindex_pre ) { - int (*preHookFunc) (struct guild *g, int *account_id, int *char_id); + int (*preHookFunc) (const struct guild *g, int *account_id, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getindex_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_getindex_pre[hIndex].func; @@ -26436,7 +26436,7 @@ int HP_guild_getindex(struct guild *g, int account_id, int char_id) { retVal___ = HPMHooks.source.guild.getindex(g, account_id, char_id); } if( HPMHooks.count.HP_guild_getindex_post ) { - int (*postHookFunc) (int retVal___, struct guild *g, int *account_id, int *char_id); + int (*postHookFunc) (int retVal___, const struct guild *g, int *account_id, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_getindex_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_getindex_post[hIndex].func; retVal___ = postHookFunc(retVal___, g, &account_id, &char_id); @@ -26633,11 +26633,11 @@ int HP_guild_recv_noinfo(int guild_id) { } return retVal___; } -int HP_guild_recv_info(struct guild *sg) { +int HP_guild_recv_info(const struct guild *sg) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_recv_info_pre ) { - int (*preHookFunc) (struct guild *sg); + int (*preHookFunc) (const struct guild *sg); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_recv_info_pre[hIndex].func; @@ -26652,7 +26652,7 @@ int HP_guild_recv_info(struct guild *sg) { retVal___ = HPMHooks.source.guild.recv_info(sg); } if( HPMHooks.count.HP_guild_recv_info_post ) { - int (*postHookFunc) (int retVal___, struct guild *sg); + int (*postHookFunc) (int retVal___, const struct guild *sg); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_recv_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_recv_info_post[hIndex].func; retVal___ = postHookFunc(retVal___, sg); @@ -27225,11 +27225,11 @@ int HP_guild_change_position(int guild_id, int idx, int mode, int exp_mode, cons } return retVal___; } -int HP_guild_position_changed(int guild_id, int idx, struct guild_position *p) { +int HP_guild_position_changed(int guild_id, int idx, const struct guild_position *p) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_position_changed_pre ) { - int (*preHookFunc) (int *guild_id, int *idx, struct guild_position *p); + int (*preHookFunc) (int *guild_id, int *idx, const struct guild_position *p); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_position_changed_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_position_changed_pre[hIndex].func; @@ -27244,7 +27244,7 @@ int HP_guild_position_changed(int guild_id, int idx, struct guild_position *p) { retVal___ = HPMHooks.source.guild.position_changed(guild_id, idx, p); } if( HPMHooks.count.HP_guild_position_changed_post ) { - int (*postHookFunc) (int retVal___, int *guild_id, int *idx, struct guild_position *p); + int (*postHookFunc) (int retVal___, int *guild_id, int *idx, const struct guild_position *p); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_position_changed_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_position_changed_post[hIndex].func; retVal___ = postHookFunc(retVal___, &guild_id, &idx, p); @@ -27468,11 +27468,11 @@ int HP_guild_skillupack(int guild_id, uint16 skill_id, int account_id) { } return retVal___; } -int HP_guild_dobreak(struct map_session_data *sd, char *name) { +int HP_guild_dobreak(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_dobreak_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *name); + int (*preHookFunc) (struct map_session_data *sd, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_dobreak_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_dobreak_pre[hIndex].func; @@ -27487,7 +27487,7 @@ int HP_guild_dobreak(struct map_session_data *sd, char *name) { retVal___ = HPMHooks.source.guild.dobreak(sd, name); } if( HPMHooks.count.HP_guild_dobreak_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_dobreak_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_dobreak_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name); @@ -27629,11 +27629,11 @@ int HP_guild_castledatasave(int castle_id, int index, int value) { } return retVal___; } -int HP_guild_castledataloadack(int len, struct guild_castle *gc) { +int HP_guild_castledataloadack(int len, const struct guild_castle *gc) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_castledataloadack_pre ) { - int (*preHookFunc) (int *len, struct guild_castle *gc); + int (*preHookFunc) (int *len, const struct guild_castle *gc); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castledataloadack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_castledataloadack_pre[hIndex].func; @@ -27648,7 +27648,7 @@ int HP_guild_castledataloadack(int len, struct guild_castle *gc) { retVal___ = HPMHooks.source.guild.castledataloadack(len, gc); } if( HPMHooks.count.HP_guild_castledataloadack_post ) { - int (*postHookFunc) (int retVal___, int *len, struct guild_castle *gc); + int (*postHookFunc) (int retVal___, int *len, const struct guild_castle *gc); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_castledataloadack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_castledataloadack_post[hIndex].func; retVal___ = postHookFunc(retVal___, &len, gc); @@ -28342,11 +28342,11 @@ void HP_guild_makemember(struct guild_member *m, struct map_session_data *sd) { } return; } -int HP_guild_check_member(struct guild *g) { +int HP_guild_check_member(const struct guild *g) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_guild_check_member_pre ) { - int (*preHookFunc) (struct guild *g); + int (*preHookFunc) (const struct guild *g); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_check_member_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_guild_check_member_pre[hIndex].func; @@ -28361,7 +28361,7 @@ int HP_guild_check_member(struct guild *g) { retVal___ = HPMHooks.source.guild.check_member(g); } if( HPMHooks.count.HP_guild_check_member_post ) { - int (*postHookFunc) (int retVal___, struct guild *g); + int (*postHookFunc) (int retVal___, const struct guild *g); for(hIndex = 0; hIndex < HPMHooks.count.HP_guild_check_member_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_guild_check_member_post[hIndex].func; retVal___ = postHookFunc(retVal___, g); @@ -29587,11 +29587,11 @@ void HP_homun_hunger_timer_delete(struct homun_data *hd) { } return; } -int HP_homun_change_name(struct map_session_data *sd, char *name) { +int HP_homun_change_name(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_homun_change_name_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *name); + int (*preHookFunc) (struct map_session_data *sd, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_change_name_pre[hIndex].func; @@ -29606,7 +29606,7 @@ int HP_homun_change_name(struct map_session_data *sd, char *name) { retVal___ = HPMHooks.source.homun.change_name(sd, name); } if( HPMHooks.count.HP_homun_change_name_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_change_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name); @@ -29614,11 +29614,11 @@ int HP_homun_change_name(struct map_session_data *sd, char *name) { } return retVal___; } -bool HP_homun_change_name_ack(struct map_session_data *sd, char *name, int flag) { +bool HP_homun_change_name_ack(struct map_session_data *sd, const char *name, int flag) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_change_name_ack_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, char *name, int *flag); + bool (*preHookFunc) (struct map_session_data *sd, const char *name, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_change_name_ack_pre[hIndex].func; @@ -29633,7 +29633,7 @@ bool HP_homun_change_name_ack(struct map_session_data *sd, char *name, int flag) retVal___ = HPMHooks.source.homun.change_name_ack(sd, name, flag); } if( HPMHooks.count.HP_homun_change_name_ack_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, char *name, int *flag); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const char *name, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_change_name_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_change_name_ack_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name, &flag); @@ -29668,11 +29668,11 @@ int HP_homun_db_search(int key, int type) { } return retVal___; } -bool HP_homun_create(struct map_session_data *sd, struct s_homunculus *hom) { +bool HP_homun_create(struct map_session_data *sd, const struct s_homunculus *hom) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_create_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, struct s_homunculus *hom); + bool (*preHookFunc) (struct map_session_data *sd, const struct s_homunculus *hom); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_create_pre[hIndex].func; @@ -29687,7 +29687,7 @@ bool HP_homun_create(struct map_session_data *sd, struct s_homunculus *hom) { retVal___ = HPMHooks.source.homun.create(sd, hom); } if( HPMHooks.count.HP_homun_create_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct s_homunculus *hom); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, const struct s_homunculus *hom); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, hom); @@ -29748,11 +29748,11 @@ bool HP_homun_call(struct map_session_data *sd) { } return retVal___; } -bool HP_homun_recv_data(int account_id, struct s_homunculus *sh, int flag) { +bool HP_homun_recv_data(int account_id, const struct s_homunculus *sh, int flag) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_homun_recv_data_pre ) { - bool (*preHookFunc) (int *account_id, struct s_homunculus *sh, int *flag); + bool (*preHookFunc) (int *account_id, const struct s_homunculus *sh, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_recv_data_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_homun_recv_data_pre[hIndex].func; @@ -29767,7 +29767,7 @@ bool HP_homun_recv_data(int account_id, struct s_homunculus *sh, int flag) { retVal___ = HPMHooks.source.homun.recv_data(account_id, sh, flag); } if( HPMHooks.count.HP_homun_recv_data_post ) { - bool (*postHookFunc) (bool retVal___, int *account_id, struct s_homunculus *sh, int *flag); + bool (*postHookFunc) (bool retVal___, int *account_id, const struct s_homunculus *sh, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_homun_recv_data_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_homun_recv_data_post[hIndex].func; retVal___ = postHookFunc(retVal___, &account_id, sh, &flag); @@ -30745,11 +30745,11 @@ int HP_intif_main_message(struct map_session_data *sd, const char *message) { } return retVal___; } -int HP_intif_wis_message(struct map_session_data *sd, char *nick, char *mes, size_t mes_len) { +int HP_intif_wis_message(struct map_session_data *sd, const char *nick, const char *mes, size_t mes_len) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_wis_message_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *nick, char *mes, size_t *mes_len); + int (*preHookFunc) (struct map_session_data *sd, const char *nick, const char *mes, size_t *mes_len); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_wis_message_pre[hIndex].func; @@ -30764,7 +30764,7 @@ int HP_intif_wis_message(struct map_session_data *sd, char *nick, char *mes, siz retVal___ = HPMHooks.source.intif.wis_message(sd, nick, mes, mes_len); } if( HPMHooks.count.HP_intif_wis_message_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *nick, char *mes, size_t *mes_len); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *nick, const char *mes, size_t *mes_len); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_wis_message_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_wis_message_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, nick, mes, &mes_len); @@ -30907,11 +30907,11 @@ int HP_intif_send_guild_storage(int account_id, struct guild_storage *gstor) { } return retVal___; } -int HP_intif_create_party(struct party_member *member, char *name, int item, int item2) { +int HP_intif_create_party(struct party_member *member, const char *name, int item, int item2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_create_party_pre ) { - int (*preHookFunc) (struct party_member *member, char *name, int *item, int *item2); + int (*preHookFunc) (struct party_member *member, const char *name, int *item, int *item2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_create_party_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_create_party_pre[hIndex].func; @@ -30926,7 +30926,7 @@ int HP_intif_create_party(struct party_member *member, char *name, int item, int retVal___ = HPMHooks.source.intif.create_party(member, name, item, item2); } if( HPMHooks.count.HP_intif_create_party_post ) { - int (*postHookFunc) (int retVal___, struct party_member *member, char *name, int *item, int *item2); + int (*postHookFunc) (int retVal___, struct party_member *member, const char *name, int *item, int *item2); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_create_party_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_create_party_post[hIndex].func; retVal___ = postHookFunc(retVal___, member, name, &item, &item2); @@ -31716,11 +31716,11 @@ int HP_intif_delete_petdata(int pet_id) { } return retVal___; } -int HP_intif_rename(struct map_session_data *sd, int type, char *name) { +int HP_intif_rename(struct map_session_data *sd, int type, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_intif_rename_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *type, char *name); + int (*preHookFunc) (struct map_session_data *sd, int *type, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_rename_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_intif_rename_pre[hIndex].func; @@ -31735,7 +31735,7 @@ int HP_intif_rename(struct map_session_data *sd, int type, char *name) { retVal___ = HPMHooks.source.intif.rename(sd, type, name); } if( HPMHooks.count.HP_intif_rename_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *type, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_intif_rename_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_intif_rename_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &type, name); @@ -35136,14 +35136,40 @@ const char* HP_itemdb_typename(int type) { } return retVal___; } -void HP_itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask) { +void HP_itemdb_jobmask2mapid(uint64 *bclass, uint64 jobmask) { + int hIndex = 0; + if( HPMHooks.count.HP_itemdb_jobmask2mapid_pre ) { + void (*preHookFunc) (uint64 *bclass, uint64 *jobmask); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobmask2mapid_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_jobmask2mapid_pre[hIndex].func; + preHookFunc(bclass, &jobmask); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.itemdb.jobmask2mapid(bclass, jobmask); + } + if( HPMHooks.count.HP_itemdb_jobmask2mapid_post ) { + void (*postHookFunc) (uint64 *bclass, uint64 *jobmask); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobmask2mapid_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_jobmask2mapid_post[hIndex].func; + postHookFunc(bclass, &jobmask); + } + } + return; +} +void HP_itemdb_jobid2mapid(uint64 *bclass, int job_id, bool enable) { int hIndex = 0; if( HPMHooks.count.HP_itemdb_jobid2mapid_pre ) { - void (*preHookFunc) (unsigned int *bclass, unsigned int *jobmask); + void (*preHookFunc) (uint64 *bclass, int *job_id, bool *enable); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobid2mapid_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_itemdb_jobid2mapid_pre[hIndex].func; - preHookFunc(bclass, &jobmask); + preHookFunc(bclass, &job_id, &enable); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -35151,13 +35177,13 @@ void HP_itemdb_jobid2mapid(unsigned int *bclass, unsigned int jobmask) { } } { - HPMHooks.source.itemdb.jobid2mapid(bclass, jobmask); + HPMHooks.source.itemdb.jobid2mapid(bclass, job_id, enable); } if( HPMHooks.count.HP_itemdb_jobid2mapid_post ) { - void (*postHookFunc) (unsigned int *bclass, unsigned int *jobmask); + void (*postHookFunc) (uint64 *bclass, int *job_id, bool *enable); for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_jobid2mapid_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_itemdb_jobid2mapid_post[hIndex].func; - postHookFunc(bclass, &jobmask); + postHookFunc(bclass, &job_id, &enable); } } return; @@ -35754,10 +35780,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 +35798,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 +35806,37 @@ 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) { +void HP_itemdb_readdb_job_sub(struct item_data *id, struct config_setting_t *t) { + int hIndex = 0; + if( HPMHooks.count.HP_itemdb_readdb_job_sub_pre ) { + void (*preHookFunc) (struct item_data *id, struct config_setting_t *t); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_job_sub_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_itemdb_readdb_job_sub_pre[hIndex].func; + preHookFunc(id, t); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.itemdb.readdb_job_sub(id, t); + } + if( HPMHooks.count.HP_itemdb_readdb_job_sub_post ) { + void (*postHookFunc) (struct item_data *id, struct config_setting_t *t); + for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_job_sub_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_itemdb_readdb_job_sub_post[hIndex].func; + postHookFunc(id, t); + } + } + return; +} +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 +35851,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 +36078,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 +36097,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 +36106,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 +36125,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 +36133,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 +36151,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 +36159,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 +36174,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 +36201,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 +36231,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 +36239,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 +36258,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 +36266,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 +36285,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 +36293,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 +36311,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 +36319,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 +36337,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 +36345,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 +36363,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 +36371,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 +36389,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 +36397,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 +36416,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 +36424,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 +36443,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 +36451,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 +36470,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 +36478,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 +36497,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 +36505,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 +36524,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 +36532,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 +36578,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 +36586,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 +36605,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 +36613,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 +36632,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 +36640,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 +36659,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 +36667,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 +36686,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 +36694,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 +36713,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 +36721,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 +36740,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 +36748,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 +36767,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 +36775,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 +36794,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 +36802,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 +36821,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 +36829,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 +36848,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 +36856,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 +36875,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 +36883,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 +36902,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 +36910,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 +36929,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 +36937,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 +36956,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 +36964,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 +36983,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 +36991,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 +37010,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 +37018,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 +37037,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 +37045,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 +37064,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 +37072,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 +37091,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 +37099,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 +37118,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 +37126,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 +37145,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 +37153,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 +37172,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 +37180,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 +37199,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 +37207,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 +37226,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 +37234,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 +37253,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 +37261,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 +37280,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 +37288,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 +37307,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 +37315,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 +37334,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 +37342,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 +37360,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 +37368,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 +37387,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 +37395,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 +37414,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 +37422,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 +37441,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 +37449,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 +37468,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 +37476,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 +37495,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 +37503,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 +37522,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 +37530,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 +37546,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 +37575,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 +37583,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 +37601,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 +37609,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 +37627,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 +37635,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 +37654,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 +37662,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; @@ -38616,6 +38938,33 @@ char* HP_iMalloc_astrdup(const char *p, const char *file, int line, const char * } return retVal___; } +char* HP_iMalloc_astrndup(const char *p, size_t size, const char *file, int line, const char *func) { + int hIndex = 0; + char* retVal___ = NULL; + if( HPMHooks.count.HP_iMalloc_astrndup_pre ) { + char* (*preHookFunc) (const char *p, size_t *size, const char *file, int *line, const char *func); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_iMalloc_astrndup_pre[hIndex].func; + retVal___ = preHookFunc(p, &size, file, &line, func); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.iMalloc.astrndup(p, size, file, line, func); + } + if( HPMHooks.count.HP_iMalloc_astrndup_post ) { + char* (*postHookFunc) (char* retVal___, const char *p, size_t *size, const char *file, int *line, const char *func); + for(hIndex = 0; hIndex < HPMHooks.count.HP_iMalloc_astrndup_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_iMalloc_astrndup_post[hIndex].func; + retVal___ = postHookFunc(retVal___, p, &size, file, &line, func); + } + } + return retVal___; +} void HP_iMalloc_free(void *p, const char *file, int line, const char *func) { int hIndex = 0; if( HPMHooks.count.HP_iMalloc_free_pre ) { @@ -43344,11 +43693,11 @@ int HP_mercenary_create(struct map_session_data *sd, int class_, unsigned int li } return retVal___; } -int HP_mercenary_data_received(struct s_mercenary *merc, bool flag) { +int HP_mercenary_data_received(const struct s_mercenary *merc, bool flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mercenary_data_received_pre ) { - int (*preHookFunc) (struct s_mercenary *merc, bool *flag); + int (*preHookFunc) (const struct s_mercenary *merc, bool *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_data_received_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mercenary_data_received_pre[hIndex].func; @@ -43363,7 +43712,7 @@ int HP_mercenary_data_received(struct s_mercenary *merc, bool flag) { retVal___ = HPMHooks.source.mercenary.data_received(merc, flag); } if( HPMHooks.count.HP_mercenary_data_received_post ) { - int (*postHookFunc) (int retVal___, struct s_mercenary *merc, bool *flag); + int (*postHookFunc) (int retVal___, const struct s_mercenary *merc, bool *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_mercenary_data_received_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mercenary_data_received_post[hIndex].func; retVal___ = postHookFunc(retVal___, merc, &flag); @@ -44729,11 +45078,11 @@ int HP_mob_spawn(struct mob_data *md) { } return retVal___; } -int HP_mob_can_changetarget(struct mob_data *md, struct block_list *target, int mode) { +int HP_mob_can_changetarget(const struct mob_data *md, const struct block_list *target, uint32 mode) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_can_changetarget_pre ) { - int (*preHookFunc) (struct mob_data *md, struct block_list *target, int *mode); + int (*preHookFunc) (const struct mob_data *md, const struct block_list *target, uint32 *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_can_changetarget_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_can_changetarget_pre[hIndex].func; @@ -44748,7 +45097,7 @@ int HP_mob_can_changetarget(struct mob_data *md, struct block_list *target, int retVal___ = HPMHooks.source.mob.can_changetarget(md, target, mode); } if( HPMHooks.count.HP_mob_can_changetarget_post ) { - int (*postHookFunc) (int retVal___, struct mob_data *md, struct block_list *target, int *mode); + int (*postHookFunc) (int retVal___, const struct mob_data *md, const struct block_list *target, uint32 *mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_can_changetarget_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_can_changetarget_post[hIndex].func; retVal___ = postHookFunc(retVal___, md, target, &mode); @@ -46044,11 +46393,11 @@ int HP_mob_is_clone(int class_) { } return retVal___; } -int HP_mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, int mode, int flag, unsigned int duration) { +int HP_mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, const char *event, int master_id, uint32 mode, int flag, unsigned int duration) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_mob_clone_spawn_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *event, int *master_id, int *mode, int *flag, unsigned int *duration); + int (*preHookFunc) (struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *event, int *master_id, uint32 *mode, int *flag, unsigned int *duration); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_clone_spawn_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_mob_clone_spawn_pre[hIndex].func; @@ -46063,7 +46412,7 @@ int HP_mob_clone_spawn(struct map_session_data *sd, int16 m, int16 x, int16 y, c retVal___ = HPMHooks.source.mob.clone_spawn(sd, m, x, y, event, master_id, mode, flag, duration); } if( HPMHooks.count.HP_mob_clone_spawn_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *event, int *master_id, int *mode, int *flag, unsigned int *duration); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int16 *m, int16 *x, int16 *y, const char *event, int *master_id, uint32 *mode, int *flag, unsigned int *duration); for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_clone_spawn_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_mob_clone_spawn_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &m, &x, &y, event, &master_id, &mode, &flag, &duration); @@ -46177,11 +46526,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 +46545,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 +46553,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 +46572,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); @@ -46231,6 +46580,33 @@ bool HP_mob_get_const(const config_setting_t *it, int *value) { } return retVal___; } +int HP_mob_db_validate_entry(struct mob_db *entry, int n, const char *source) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_mob_db_validate_entry_pre ) { + int (*preHookFunc) (struct mob_db *entry, int *n, const char *source); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_validate_entry_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_mob_db_validate_entry_pre[hIndex].func; + retVal___ = preHookFunc(entry, &n, source); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.mob.db_validate_entry(entry, n, source); + } + if( HPMHooks.count.HP_mob_db_validate_entry_post ) { + int (*postHookFunc) (int retVal___, struct mob_db *entry, int *n, const char *source); + for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_validate_entry_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_mob_db_validate_entry_post[hIndex].func; + retVal___ = postHookFunc(retVal___, entry, &n, source); + } + } + return retVal___; +} int HP_mob_read_libconfig(const char *filename, bool ignore_missing) { int hIndex = 0; int retVal___ = 0; @@ -46258,14 +46634,14 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) { } return retVal___; } -void HP_mob_read_db_additional_fields(struct mob_db *entry, int class_, 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, int *class_, 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; - preHookFunc(entry, &class_, it, &n, source); + preHookFunc(entry, it, &n, source); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46273,22 +46649,22 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, int class_, config_s } } { - HPMHooks.source.mob.read_db_additional_fields(entry, class_, it, n, source); + 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, int *class_, 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, &class_, it, &n, source); + postHookFunc(entry, it, &n, source); } } return; } -bool 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; - bool retVal___ = false; + int retVal___ = 0; if( HPMHooks.count.HP_mob_read_db_sub_pre ) { - bool (*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; @@ -46303,7 +46679,7 @@ bool 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 ) { - bool (*postHookFunc) (bool 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); @@ -46311,14 +46687,14 @@ bool 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, struct status_data *mstatus, int class_, 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, struct status_data *mstatus, int *class_, 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; - preHookFunc(entry, mstatus, &class_, t); + preHookFunc(entry, t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46326,25 +46702,25 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, struct status_data *mstatus, } } { - HPMHooks.source.mob.read_db_drops_sub(entry, mstatus, class_, 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, struct status_data *mstatus, int *class_, 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, mstatus, &class_, t); + postHookFunc(entry, t); } } return; } -void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct status_data *mstatus, int class_, 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, struct status_data *mstatus, int *class_, 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; - preHookFunc(entry, mstatus, &class_, t); + preHookFunc(entry, t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46352,26 +46728,26 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct status_data *mstat } } { - HPMHooks.source.mob.read_db_mvpdrops_sub(entry, mstatus, class_, 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, struct status_data *mstatus, int *class_, 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, mstatus, &class_, t); + postHookFunc(entry, t); } } return; } -int HP_mob_read_db_mode_sub(struct mob_db *entry, struct status_data *mstatus, int class_, config_setting_t *t) { +uint32 HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) { int hIndex = 0; - int retVal___ = 0; + uint32 retVal___ = 0; if( HPMHooks.count.HP_mob_read_db_mode_sub_pre ) { - int (*preHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t); + uint32 (*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; - retVal___ = preHookFunc(entry, mstatus, &class_, t); + retVal___ = preHookFunc(entry, t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46379,25 +46755,25 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, struct status_data *mstatus, i } } { - retVal___ = HPMHooks.source.mob.read_db_mode_sub(entry, mstatus, class_, 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, struct status_data *mstatus, int *class_, config_setting_t *t); + uint32 (*postHookFunc) (uint32 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, mstatus, &class_, t); + retVal___ = postHookFunc(retVal___, entry, t); } } return retVal___; } -void HP_mob_read_db_stats_sub(struct mob_db *entry, struct status_data *mstatus, int class_, 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, struct status_data *mstatus, int *class_, 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; - preHookFunc(entry, mstatus, &class_, t); + preHookFunc(entry, t); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -46405,13 +46781,13 @@ void HP_mob_read_db_stats_sub(struct mob_db *entry, struct status_data *mstatus, } } { - HPMHooks.source.mob.read_db_stats_sub(entry, mstatus, class_, 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, struct status_data *mstatus, int *class_, 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, mstatus, &class_, t); + postHookFunc(entry, t); } } return; @@ -48140,15 +48516,15 @@ int HP_npc_buysellsel(struct map_session_data *sd, int id, int type) { } return retVal___; } -int HP_npc_cashshop_buylist(struct map_session_data *sd, int points, int count, unsigned short *item_list) { +int HP_npc_cashshop_buylist(struct map_session_data *sd, int points, struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_cashshop_buylist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *points, int *count, unsigned short *item_list); + int (*preHookFunc) (struct map_session_data *sd, int *points, struct itemlist *item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_cashshop_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_cashshop_buylist_pre[hIndex].func; - retVal___ = preHookFunc(sd, &points, &count, item_list); + retVal___ = preHookFunc(sd, &points, item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48156,26 +48532,26 @@ int HP_npc_cashshop_buylist(struct map_session_data *sd, int points, int count, } } { - retVal___ = HPMHooks.source.npc.cashshop_buylist(sd, points, count, item_list); + retVal___ = HPMHooks.source.npc.cashshop_buylist(sd, points, item_list); } if( HPMHooks.count.HP_npc_cashshop_buylist_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *points, int *count, unsigned short *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *points, struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_cashshop_buylist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_cashshop_buylist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &points, &count, item_list); + retVal___ = postHookFunc(retVal___, sd, &points, item_list); } } return retVal___; } -int HP_npc_buylist_sub(struct map_session_data *sd, int n, unsigned short *item_list, struct npc_data *nd) { +int HP_npc_buylist_sub(struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_buylist_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, unsigned short *item_list, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buylist_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_buylist_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, item_list, nd); + retVal___ = preHookFunc(sd, item_list, nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48183,13 +48559,13 @@ int HP_npc_buylist_sub(struct map_session_data *sd, int n, unsigned short *item_ } } { - retVal___ = HPMHooks.source.npc.buylist_sub(sd, n, item_list, nd); + retVal___ = HPMHooks.source.npc.buylist_sub(sd, item_list, nd); } if( HPMHooks.count.HP_npc_buylist_sub_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, unsigned short *item_list, struct npc_data *nd); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buylist_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_buylist_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, item_list, nd); + retVal___ = postHookFunc(retVal___, sd, item_list, nd); } } return retVal___; @@ -48221,15 +48597,15 @@ int HP_npc_cashshop_buy(struct map_session_data *sd, int nameid, int amount, int } return retVal___; } -int HP_npc_buylist(struct map_session_data *sd, int n, unsigned short *item_list) { +int HP_npc_buylist(struct map_session_data *sd, struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_buylist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, unsigned short *item_list); + int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_buylist_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, item_list); + retVal___ = preHookFunc(sd, item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48237,26 +48613,26 @@ int HP_npc_buylist(struct map_session_data *sd, int n, unsigned short *item_list } } { - retVal___ = HPMHooks.source.npc.buylist(sd, n, item_list); + retVal___ = HPMHooks.source.npc.buylist(sd, item_list); } if( HPMHooks.count.HP_npc_buylist_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, unsigned short *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_buylist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_buylist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, item_list); + retVal___ = postHookFunc(retVal___, sd, item_list); } } return retVal___; } -int HP_npc_selllist_sub(struct map_session_data *sd, int n, unsigned short *item_list, struct npc_data *nd) { +int HP_npc_selllist_sub(struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_selllist_sub_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, unsigned short *item_list, struct npc_data *nd); + int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_selllist_sub_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_selllist_sub_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, item_list, nd); + retVal___ = preHookFunc(sd, item_list, nd); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48264,26 +48640,26 @@ int HP_npc_selllist_sub(struct map_session_data *sd, int n, unsigned short *item } } { - retVal___ = HPMHooks.source.npc.selllist_sub(sd, n, item_list, nd); + retVal___ = HPMHooks.source.npc.selllist_sub(sd, item_list, nd); } if( HPMHooks.count.HP_npc_selllist_sub_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, unsigned short *item_list, struct npc_data *nd); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list, struct npc_data *nd); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_selllist_sub_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_selllist_sub_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, item_list, nd); + retVal___ = postHookFunc(retVal___, sd, item_list, nd); } } return retVal___; } -int HP_npc_selllist(struct map_session_data *sd, int n, unsigned short *item_list) { +int HP_npc_selllist(struct map_session_data *sd, struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_selllist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, unsigned short *item_list); + int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_selllist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_selllist_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, item_list); + retVal___ = preHookFunc(sd, item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -48291,13 +48667,13 @@ int HP_npc_selllist(struct map_session_data *sd, int n, unsigned short *item_lis } } { - retVal___ = HPMHooks.source.npc.selllist(sd, n, item_list); + retVal___ = HPMHooks.source.npc.selllist(sd, item_list); } if( HPMHooks.count.HP_npc_selllist_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, unsigned short *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_selllist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_selllist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, item_list); + retVal___ = postHookFunc(retVal___, sd, item_list); } } return retVal___; @@ -49775,15 +50151,15 @@ void HP_npc_trader_update(int master) { } return; } -int HP_npc_market_buylist(struct map_session_data *sd, unsigned short list_size, struct packet_npc_market_purchase *p) { +int HP_npc_market_buylist(struct map_session_data *sd, struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_npc_market_buylist_pre ) { - int (*preHookFunc) (struct map_session_data *sd, unsigned short *list_size, struct packet_npc_market_purchase *p); + int (*preHookFunc) (struct map_session_data *sd, struct itemlist *item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_npc_market_buylist_pre[hIndex].func; - retVal___ = preHookFunc(sd, &list_size, p); + retVal___ = preHookFunc(sd, item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -49791,13 +50167,13 @@ int HP_npc_market_buylist(struct map_session_data *sd, unsigned short list_size, } } { - retVal___ = HPMHooks.source.npc.market_buylist(sd, list_size, p); + retVal___ = HPMHooks.source.npc.market_buylist(sd, item_list); } if( HPMHooks.count.HP_npc_market_buylist_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, unsigned short *list_size, struct packet_npc_market_purchase *p); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_market_buylist_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_npc_market_buylist_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &list_size, p); + retVal___ = postHookFunc(retVal___, sd, item_list); } } return retVal___; @@ -50175,11 +50551,11 @@ struct map_session_data* HP_party_getavailablesd(struct party_data *p) { } return retVal___; } -int HP_party_create(struct map_session_data *sd, char *name, int item, int item2) { +int HP_party_create(struct map_session_data *sd, const char *name, int item, int item2) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_create_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *name, int *item, int *item2); + int (*preHookFunc) (struct map_session_data *sd, const char *name, int *item, int *item2); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_create_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_create_pre[hIndex].func; @@ -50194,7 +50570,7 @@ int HP_party_create(struct map_session_data *sd, char *name, int item, int item2 retVal___ = HPMHooks.source.party.create(sd, name, item, item2); } if( HPMHooks.count.HP_party_create_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *name, int *item, int *item2); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int *item, int *item2); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_create_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_create_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name, &item, &item2); @@ -50202,10 +50578,10 @@ int HP_party_create(struct map_session_data *sd, char *name, int item, int item2 } return retVal___; } -void HP_party_created(int account_id, int char_id, int fail, int party_id, char *name) { +void HP_party_created(int account_id, int char_id, int fail, int party_id, const char *name) { int hIndex = 0; if( HPMHooks.count.HP_party_created_pre ) { - void (*preHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, char *name); + void (*preHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_created_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_created_pre[hIndex].func; @@ -50220,7 +50596,7 @@ void HP_party_created(int account_id, int char_id, int fail, int party_id, char HPMHooks.source.party.created(account_id, char_id, fail, party_id, name); } if( HPMHooks.count.HP_party_created_post ) { - void (*postHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, char *name); + void (*postHookFunc) (int *account_id, int *char_id, int *fail, int *party_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_created_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_created_post[hIndex].func; postHookFunc(&account_id, &char_id, &fail, &party_id, name); @@ -50362,11 +50738,11 @@ int HP_party_leave(struct map_session_data *sd) { } return retVal___; } -int HP_party_removemember(struct map_session_data *sd, int account_id, char *name) { +int HP_party_removemember(struct map_session_data *sd, int account_id, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_removemember_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *account_id, char *name); + int (*preHookFunc) (struct map_session_data *sd, int *account_id, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_removemember_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_removemember_pre[hIndex].func; @@ -50381,7 +50757,7 @@ int HP_party_removemember(struct map_session_data *sd, int account_id, char *nam retVal___ = HPMHooks.source.party.removemember(sd, account_id, name); } if( HPMHooks.count.HP_party_removemember_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *account_id, char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *account_id, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_removemember_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_removemember_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &account_id, name); @@ -50469,11 +50845,11 @@ int HP_party_recv_noinfo(int party_id, int char_id) { } return retVal___; } -int HP_party_recv_info(struct party *sp, int char_id) { +int HP_party_recv_info(const struct party *sp, int char_id) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_party_recv_info_pre ) { - int (*preHookFunc) (struct party *sp, int *char_id); + int (*preHookFunc) (const struct party *sp, int *char_id); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_info_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_party_recv_info_pre[hIndex].func; @@ -50488,7 +50864,7 @@ int HP_party_recv_info(struct party *sp, int char_id) { retVal___ = HPMHooks.source.party.recv_info(sp, char_id); } if( HPMHooks.count.HP_party_recv_info_post ) { - int (*postHookFunc) (int retVal___, struct party *sp, int *char_id); + int (*postHookFunc) (int retVal___, const struct party *sp, int *char_id); for(hIndex = 0; hIndex < HPMHooks.count.HP_party_recv_info_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_party_recv_info_post[hIndex].func; retVal___ = postHookFunc(retVal___, sp, &char_id); @@ -52181,11 +52557,11 @@ int HP_pc_setnewpc(struct map_session_data *sd, int account_id, int char_id, int } return retVal___; } -bool HP_pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_time, int group_id, struct mmo_charstatus *st, bool changing_mapservers) { +bool HP_pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_time, int group_id, const struct mmo_charstatus *st, bool changing_mapservers) { int hIndex = 0; bool retVal___ = false; if( HPMHooks.count.HP_pc_authok_pre ) { - bool (*preHookFunc) (struct map_session_data *sd, int *login_id2, time_t *expiration_time, int *group_id, struct mmo_charstatus *st, bool *changing_mapservers); + bool (*preHookFunc) (struct map_session_data *sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus *st, bool *changing_mapservers); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_authok_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_authok_pre[hIndex].func; @@ -52200,7 +52576,7 @@ bool HP_pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_ retVal___ = HPMHooks.source.pc.authok(sd, login_id2, expiration_time, group_id, st, changing_mapservers); } if( HPMHooks.count.HP_pc_authok_post ) { - bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *login_id2, time_t *expiration_time, int *group_id, struct mmo_charstatus *st, bool *changing_mapservers); + bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, int *login_id2, time_t *expiration_time, int *group_id, const struct mmo_charstatus *st, bool *changing_mapservers); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_authok_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_authok_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, &login_id2, &expiration_time, &group_id, st, &changing_mapservers); @@ -56340,11 +56716,11 @@ void HP_pc_baselevelchanged(struct map_session_data *sd) { } return; } -int HP_pc_level_penalty_mod(int diff, unsigned char race, unsigned short mode, int type) { +int HP_pc_level_penalty_mod(int diff, unsigned char race, uint32 mode, int type) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pc_level_penalty_mod_pre ) { - int (*preHookFunc) (int *diff, unsigned char *race, unsigned short *mode, int *type); + int (*preHookFunc) (int *diff, unsigned char *race, uint32 *mode, int *type); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_level_penalty_mod_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pc_level_penalty_mod_pre[hIndex].func; @@ -56359,7 +56735,7 @@ int HP_pc_level_penalty_mod(int diff, unsigned char race, unsigned short mode, i retVal___ = HPMHooks.source.pc.level_penalty_mod(diff, race, mode, type); } if( HPMHooks.count.HP_pc_level_penalty_mod_post ) { - int (*postHookFunc) (int retVal___, int *diff, unsigned char *race, unsigned short *mode, int *type); + int (*postHookFunc) (int retVal___, int *diff, unsigned char *race, uint32 *mode, int *type); for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_level_penalty_mod_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pc_level_penalty_mod_post[hIndex].func; retVal___ = postHookFunc(retVal___, &diff, &race, &mode, &type); @@ -57731,15 +58107,15 @@ pcre_extra* HP_libpcre_study(const pcre *code, int options, const char **errptr) } return retVal___; } -int HP_libpcre_exec(const pcre *code, const pcre_extra *extra, const char *subject, int length, int startoffset, int options, int *ovector, int ovecsize) { +int HP_libpcre_exec(const pcre *code, const pcre_extra *extra, PCRE_SPTR subject, int length, int startoffset, int options, int *ovector, int ovecsize) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_libpcre_exec_pre ) { - int (*preHookFunc) (const pcre *code, const pcre_extra *extra, const char *subject, int *length, int *startoffset, int *options, int *ovector, int *ovecsize); + int (*preHookFunc) (const pcre *code, const pcre_extra *extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int *ovector, int *ovecsize); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_exec_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_libpcre_exec_pre[hIndex].func; - retVal___ = preHookFunc(code, extra, subject, &length, &startoffset, &options, ovector, &ovecsize); + retVal___ = preHookFunc(code, extra, &subject, &length, &startoffset, &options, ovector, &ovecsize); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -57750,10 +58126,10 @@ int HP_libpcre_exec(const pcre *code, const pcre_extra *extra, const char *subje retVal___ = HPMHooks.source.libpcre.exec(code, extra, subject, length, startoffset, options, ovector, ovecsize); } if( HPMHooks.count.HP_libpcre_exec_post ) { - int (*postHookFunc) (int retVal___, const pcre *code, const pcre_extra *extra, const char *subject, int *length, int *startoffset, int *options, int *ovector, int *ovecsize); + int (*postHookFunc) (int retVal___, const pcre *code, const pcre_extra *extra, PCRE_SPTR *subject, int *length, int *startoffset, int *options, int *ovector, int *ovecsize); for(hIndex = 0; hIndex < HPMHooks.count.HP_libpcre_exec_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_libpcre_exec_post[hIndex].func; - retVal___ = postHookFunc(retVal___, code, extra, subject, &length, &startoffset, &options, ovector, &ovecsize); + retVal___ = postHookFunc(retVal___, code, extra, &subject, &length, &startoffset, &options, ovector, &ovecsize); } } return retVal___; @@ -58572,11 +58948,11 @@ int HP_pet_menu(struct map_session_data *sd, int menunum) { } return retVal___; } -int HP_pet_change_name(struct map_session_data *sd, char *name) { +int HP_pet_change_name(struct map_session_data *sd, const char *name) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_change_name_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *name); + int (*preHookFunc) (struct map_session_data *sd, const char *name); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_change_name_pre[hIndex].func; @@ -58591,7 +58967,7 @@ int HP_pet_change_name(struct map_session_data *sd, char *name) { retVal___ = HPMHooks.source.pet.change_name(sd, name); } if( HPMHooks.count.HP_pet_change_name_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *name); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_change_name_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name); @@ -58599,11 +58975,11 @@ int HP_pet_change_name(struct map_session_data *sd, char *name) { } return retVal___; } -int HP_pet_change_name_ack(struct map_session_data *sd, char *name, int flag) { +int HP_pet_change_name_ack(struct map_session_data *sd, const char *name, int flag) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_pet_change_name_ack_pre ) { - int (*preHookFunc) (struct map_session_data *sd, char *name, int *flag); + int (*preHookFunc) (struct map_session_data *sd, const char *name, int *flag); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_ack_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_pet_change_name_ack_pre[hIndex].func; @@ -58618,7 +58994,7 @@ int HP_pet_change_name_ack(struct map_session_data *sd, char *name, int flag) { retVal___ = HPMHooks.source.pet.change_name_ack(sd, name, flag); } if( HPMHooks.count.HP_pet_change_name_ack_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, char *name, int *flag); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const char *name, int *flag); for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_change_name_ack_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_pet_change_name_ack_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, name, &flag); @@ -59309,11 +59685,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; @@ -59328,7 +59704,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); @@ -61731,6 +62107,32 @@ void HP_script_read_constdb(void) { } return; } +void HP_script_constdb_comment(const char *comment) { + int hIndex = 0; + if( HPMHooks.count.HP_script_constdb_comment_pre ) { + void (*preHookFunc) (const char *comment); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_constdb_comment_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_constdb_comment_pre[hIndex].func; + preHookFunc(comment); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.script.constdb_comment(comment); + } + if( HPMHooks.count.HP_script_constdb_comment_post ) { + void (*postHookFunc) (const char *comment); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_constdb_comment_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_constdb_comment_post[hIndex].func; + postHookFunc(comment); + } + } + return; +} const char* HP_script_print_line(StringBuf *buf, const char *p, const char *mark, int line) { int hIndex = 0; const char* retVal___ = NULL; @@ -69234,15 +69636,15 @@ int HP_skill_select_menu(struct map_session_data *sd, uint16 skill_id) { } return retVal___; } -int HP_skill_elementalanalysis(struct map_session_data *sd, int n, uint16 skill_lv, unsigned short *item_list) { +int HP_skill_elementalanalysis(struct map_session_data *sd, uint16 skill_lv, const struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_elementalanalysis_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, uint16 *skill_lv, unsigned short *item_list); + int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_lv, const struct itemlist *item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_elementalanalysis_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_elementalanalysis_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, &skill_lv, item_list); + retVal___ = preHookFunc(sd, &skill_lv, item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69250,26 +69652,26 @@ int HP_skill_elementalanalysis(struct map_session_data *sd, int n, uint16 skill_ } } { - retVal___ = HPMHooks.source.skill.elementalanalysis(sd, n, skill_lv, item_list); + retVal___ = HPMHooks.source.skill.elementalanalysis(sd, skill_lv, item_list); } if( HPMHooks.count.HP_skill_elementalanalysis_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, uint16 *skill_lv, unsigned short *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_lv, const struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_elementalanalysis_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_elementalanalysis_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, &skill_lv, item_list); + retVal___ = postHookFunc(retVal___, sd, &skill_lv, item_list); } } return retVal___; } -int HP_skill_changematerial(struct map_session_data *sd, int n, unsigned short *item_list) { +int HP_skill_changematerial(struct map_session_data *sd, const struct itemlist *item_list) { int hIndex = 0; int retVal___ = 0; if( HPMHooks.count.HP_skill_changematerial_pre ) { - int (*preHookFunc) (struct map_session_data *sd, int *n, unsigned short *item_list); + int (*preHookFunc) (struct map_session_data *sd, const struct itemlist *item_list); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_changematerial_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_skill_changematerial_pre[hIndex].func; - retVal___ = preHookFunc(sd, &n, item_list); + retVal___ = preHookFunc(sd, item_list); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -69277,13 +69679,13 @@ int HP_skill_changematerial(struct map_session_data *sd, int n, unsigned short * } } { - retVal___ = HPMHooks.source.skill.changematerial(sd, n, item_list); + retVal___ = HPMHooks.source.skill.changematerial(sd, item_list); } if( HPMHooks.count.HP_skill_changematerial_post ) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd, int *n, unsigned short *item_list); + int (*postHookFunc) (int retVal___, struct map_session_data *sd, const struct itemlist *item_list); for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_changematerial_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_skill_changematerial_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd, &n, item_list); + retVal___ = postHookFunc(retVal___, sd, item_list); } } return retVal___; @@ -70938,11 +71340,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; @@ -70957,7 +71359,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); @@ -74504,11 +74906,11 @@ unsigned char HP_status_calc_element_lv(struct block_list *bl, struct status_cha } return retVal___; } -unsigned short HP_status_calc_mode(struct block_list *bl, struct status_change *sc, int mode) { +uint32 HP_status_calc_mode(const struct block_list *bl, const struct status_change *sc, uint32 mode) { int hIndex = 0; - unsigned short retVal___ = 0; + uint32 retVal___ = 0; if( HPMHooks.count.HP_status_calc_mode_pre ) { - unsigned short (*preHookFunc) (struct block_list *bl, struct status_change *sc, int *mode); + uint32 (*preHookFunc) (const struct block_list *bl, const struct status_change *sc, uint32 *mode); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mode_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_calc_mode_pre[hIndex].func; @@ -74523,7 +74925,7 @@ unsigned short HP_status_calc_mode(struct block_list *bl, struct status_change * retVal___ = HPMHooks.source.status.calc_mode(bl, sc, mode); } if( HPMHooks.count.HP_status_calc_mode_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, struct status_change *sc, int *mode); + uint32 (*postHookFunc) (uint32 retVal___, const struct block_list *bl, const struct status_change *sc, uint32 *mode); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_calc_mode_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_calc_mode_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl, sc, &mode); @@ -74777,11 +75179,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; @@ -74796,7 +75198,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); @@ -74857,10 +75259,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; @@ -74875,7 +75277,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); @@ -76350,6 +76752,33 @@ const char* HP_sysinfo_cflags(void) { } return retVal___; } +const char* HP_sysinfo_time(void) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_sysinfo_time_pre ) { + const char* (*preHookFunc) (void); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_sysinfo_time_pre[hIndex].func; + retVal___ = preHookFunc(); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.sysinfo.time(); + } + if( HPMHooks.count.HP_sysinfo_time_post ) { + const char* (*postHookFunc) (const char* retVal___); + for(hIndex = 0; hIndex < HPMHooks.count.HP_sysinfo_time_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_sysinfo_time_post[hIndex].func; + retVal___ = postHookFunc(retVal___); + } + } + return retVal___; +} const char* HP_sysinfo_vcstype(void) { int hIndex = 0; const char* retVal___ = NULL; diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 6e8e3bfac..3fe38b6bc 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -102,7 +102,7 @@ Makefile: Makefile.in ../../plugins/%@DLLEXT@: %.c $(ALL_H) $$(shell ls %/* 2>/dev/null) @echo " CC $<" - @$(CC) $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @PLUGINSTATIC@ @DEFS@ @CFLAGS@ @PCRE_CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $< + @$(CC) $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @PLUGINSTATIC@ @DEFS@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $< ../../plugins/HPMHooking_login@DLLEXT@: HPMHOOKINGTYPE = LOGIN ../../plugins/HPMHooking_char@DLLEXT@: HPMHOOKINGTYPE = CHAR @@ -110,4 +110,4 @@ Makefile: Makefile.in ../../plugins/HPMHooking_%@DLLEXT@: HPMHooking.c $(ALL_H) $$(shell ls HPMHooking/*_%* HPMHooking/*_common* 2>/dev/null) @echo " CC $< ($(HPMHOOKINGTYPE))" - @$(CC) -DHPMHOOKING_$(HPMHOOKINGTYPE) $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @PLUGINSTATIC@ @DEFS@ @CFLAGS@ @PCRE_CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $< + @$(CC) -DHPMHOOKING_$(HPMHOOKINGTYPE) $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @PLUGINSTATIC@ @DEFS@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $< diff --git a/src/plugins/constdb2doc.c b/src/plugins/constdb2doc.c new file mode 100644 index 000000000..1d5f37ad5 --- /dev/null +++ b/src/plugins/constdb2doc.c @@ -0,0 +1,197 @@ +/** + * This file is part of Hercules. + * http://herc.ws - http://github.com/HerculesWS/Hercules + * + * Copyright (C) 2016 Hercules Dev Team + * Copyright (C) 2016 Haru <haru@dotalux.com> + * + * Hercules is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +/// db/constants.conf -> doc/constants.md generator plugin + +#include "common/hercules.h" +//#include "common/memmgr.h" +#include "common/nullpo.h" +#include "common/strlib.h" +#include "map/itemdb.h" +#include "map/mob.h" +#include "map/script.h" +#include "map/skill.h" + +#include "common/HPMDataCheck.h" + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <sys/stat.h> + +#define OUTPUTFILENAME "doc" PATHSEP_STR "constants.md" + +HPExport struct hplugin_info pinfo = { + "constdb2doc", // Plugin name + SERVER_TYPE_MAP, // Which server types this plugin works with? + "0.1", // Plugin version + HPM_VERSION, // HPM Version (don't change, macro is automatically updated) +}; + +FILE *out_fp; +bool torun = false; + +/// To override script_constdb_comment +void constdb2doc_constdb_comment(const char *comment) +{ + nullpo_retv(out_fp); + if (comment == NULL) + fprintf(out_fp, "\n"); + else + fprintf(out_fp, "\n### %s\n\n", comment); +} + +/// To override script_set_constant, called by script_read_constdb +void constdb2doc_script_set_constant(const char *name, int value, bool is_parameter, bool is_deprecated) +{ + nullpo_retv(out_fp); + + if (is_parameter) + fprintf(out_fp, "- `%s`: [param]%s\n", name, is_deprecated ? " **(DEPRECATED)**" : ""); + else + fprintf(out_fp, "- `%s`: %d%s\n", name, value, is_deprecated ? " **(DEPRECATED)**" : ""); +} + +void constdb2doc_constdb(void) +{ + void (*script_set_constant) (const char* name, int value, bool is_parameter, bool is_deprecated) = NULL; + void (*script_constdb_comment) (const char *comment) = NULL; + + nullpo_retv(out_fp); + + /* Link */ + script_set_constant = script->set_constant; + script->set_constant = constdb2doc_script_set_constant; + script_constdb_comment = script->constdb_comment; + script->constdb_comment = constdb2doc_constdb_comment; + + /* Run */ + fprintf(out_fp, "## Constants (db/constants.conf)\n\n"); + script->read_constdb(); + fprintf(out_fp, "\n"); + + fprintf(out_fp, "## Hardcoded Constants (source)\n\n"); + script->hardcoded_constants(); + fprintf(out_fp, "\n"); + + /* Unlink */ + script->set_constant = script_set_constant; + script->constdb_comment = script_constdb_comment; +} + +void constdb2doc_skilldb(void) +{ + int i; + + nullpo_retv(out_fp); + + fprintf(out_fp, "## Skills (db/"DBPATH"skill_db.txt)\n\n"); + for (i = 1; i < MAX_SKILL_DB; i++) { + if (skill->dbs->db[i].name[0] != '\0') + fprintf(out_fp, "- `%s`: %d\n", skill->dbs->db[i].name, skill->dbs->db[i].nameid); + } + fprintf(out_fp, "\n"); +} + +void constdb2doc_mobdb(void) +{ + int i; + + nullpo_retv(out_fp); + + fprintf(out_fp, "## Mobs (db/"DBPATH"mob_db.txt)\n\n"); + for (i = 0; i < MAX_MOB_DB; i++) { + struct mob_db *md = mob->db(i); + if (md == mob->dummy || md->sprite[0] == '\0') + continue; + fprintf(out_fp, "- `%s`: %d\n", md->sprite, i); + } + fprintf(out_fp, "\n"); +} + +/// Cloned from itemdb_search +struct item_data *constdb2doc_itemdb_search(int nameid) +{ + if (nameid >= 0 && nameid < ARRAYLENGTH(itemdb->array)) + return itemdb->array[nameid]; + + return idb_get(itemdb->other, nameid); +} + +void constdb2doc_itemdb(void) +{ + int i; + + nullpo_retv(out_fp); + + fprintf(out_fp, "## Items (db/"DBPATH"item_db.conf)\n"); + for (i = 0; i < ARRAYLENGTH(itemdb->array); i++) { + struct item_data *id = constdb2doc_itemdb_search(i); + if (id == NULL || id->name[0] == '\0') + continue; + fprintf(out_fp, "- `%s`: %d\n", id->name, id->nameid); + } + fprintf(out_fp, "\n"); +} + +void do_constdb2doc(void) +{ + /* File Type Detector */ + if ((out_fp = fopen(OUTPUTFILENAME, "wt+")) == NULL) { + ShowError("do_constdb2doc: Unable to open output file.\n"); + return; + } + + fprintf(out_fp, + "# Constants\n\n" + "> This document contains all the constants available to the script engine.\n\n"); + + constdb2doc_constdb(); + + constdb2doc_skilldb(); + + constdb2doc_mobdb(); + + constdb2doc_itemdb(); + + fprintf(out_fp, "> End of list\n"); + + fclose(out_fp); +} +CPCMD(constdb2doc) { + do_constdb2doc(); +} +CMDLINEARG(constdb2doc) +{ + map->minimal = torun = true; + return true; +} +HPExport void server_preinit(void) { + addArg("--constdb2doc", false, constdb2doc, NULL); +} +HPExport void plugin_init(void) { + addCPCommand("server:tools:constdb2doc", constdb2doc); +} +HPExport void server_online(void) { + if (torun) + do_constdb2doc(); +} diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c index 5b5d79bac..34e1c2053 100644 --- a/src/plugins/db2sql.c +++ b/src/plugins/db2sql.c @@ -24,12 +24,12 @@ #include "common/conf.h" #include "common/memmgr.h" #include "common/mmo.h" +#include "common/nullpo.h" #include "common/strlib.h" -#include "common/timer.h" -#include "map/clif.h" +#include "map/battle.h" #include "map/itemdb.h" +#include "map/mob.h" #include "map/map.h" -#include "map/pc.h" #include "common/HPMDataCheck.h" @@ -43,38 +43,102 @@ HPExport struct hplugin_info pinfo = { HPM_VERSION, // HPM Version (don't change, macro is automatically updated) }; +#ifdef RENEWAL +#define DBSUFFIX "_re" +#else // not RENEWAL +#define DBSUFFIX "" +#endif + +/// Conversion state tracking. struct { - FILE *fp; + FILE *fp; ///< Currently open file pointer struct { - char *p; - size_t len; - } buf[4]; - char *db_name; + char *p; ///< Buffer pointer + size_t len; ///< Buffer length + } buf[4]; ///< Output buffer + const char *db_name; ///< Database table name } tosql; -bool torun = false; -int (*itemdb_readdb_libconfig_sub) (config_setting_t *it, int n, const char *source); +/// Whether the item_db converter will automatically run. +bool itemdb2sql_torun = false; +/// Whether the mob_db converter will automatically run. +bool mobdb2sql_torun = false; + +/// Backup of the original item_db parser function pointer. +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) (struct config_setting_t *it, int n, const char *source); -void hstr(const char *str) { - if( strlen(str) > tosql.buf[3].len ) { +/** + * Normalizes and appends a string to the output buffer. + * + * @param str The string to append. + */ +void hstr(const char *str) +{ + if (strlen(str) > tosql.buf[3].len) { tosql.buf[3].len = tosql.buf[3].len + strlen(str) + 1000; RECREATE(tosql.buf[3].p,char,tosql.buf[3].len); } safestrncpy(tosql.buf[3].p,str,strlen(str)); normalize_name(tosql.buf[3].p,"\t\n "); } -int db2sql(config_setting_t *entry, int n, const char *source) { + +/** + * Prints a SQL file header for the current item_db file. + */ +void db2sql_fileheader(void) +{ + time_t t = time(NULL); + struct tm *lt = localtime(&t); + int year = lt->tm_year+1900; + + fprintf(tosql.fp, + "-- This file is part of Hercules.\n" + "-- http://herc.ws - http://github.com/HerculesWS/Hercules\n" + "--\n" + "-- Copyright (C) 2013-%d Hercules Dev Team\n" + "--\n" + "-- Hercules is free software: you can redistribute it and/or modify\n" + "-- it under the terms of the GNU General Public License as published by\n" + "-- the Free Software Foundation, either version 3 of the License, or\n" + "-- (at your option) any later version.\n" + "--\n" + "-- This program is distributed in the hope that it will be useful,\n" + "-- but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "-- GNU General Public License for more details.\n" + "--\n" + "-- You should have received a copy of the GNU General Public License\n" + "-- along with this program. If not, see <http://www.gnu.org/licenses/>.\n\n" + + "-- NOTE: This file was auto-generated and should never be manually edited,\n" + "-- as it will get overwritten. If you need to modify this file,\n" + "-- please consider modifying the corresponding .conf file inside\n" + "-- the db folder, and then re-run the db2sql plugin.\n" + "\n", year); +} + +/** + * Converts an Item DB entry to SQL. + * + * @see itemdb_readdb_libconfig_sub. + */ +int itemdb2sql_sub(struct config_setting_t *entry, int n, const char *source) +{ struct item_data *it = NULL; - if( (it = itemdb->exists(itemdb_readdb_libconfig_sub(entry,n,source))) ) { + if ((it = itemdb->exists(itemdb_readdb_libconfig_sub(entry,n,source)))) { char e_name[ITEM_NAME_LENGTH*2+1]; const char *bonus = NULL; char *str; int i32; - unsigned int ui32; - config_setting_t *t = NULL; + uint32 ui32; + struct config_setting_t *t = NULL; StringBuf buf; + nullpo_ret(entry); + StrBuf->Init(&buf); // id @@ -89,88 +153,88 @@ int db2sql(config_setting_t *entry, int n, const char *source) { StrBuf->Printf(&buf, "'%s',", e_name); // type - StrBuf->Printf(&buf, "'%u',", it->flag.delay_consume?IT_DELAYCONSUME:it->type); + StrBuf->Printf(&buf, "'%d',", it->flag.delay_consume ? IT_DELAYCONSUME : it->type); // price_buy - StrBuf->Printf(&buf, "'%u',", it->value_buy); + StrBuf->Printf(&buf, "'%d',", it->value_buy); // price_sell - StrBuf->Printf(&buf, "'%u',", it->value_sell); + StrBuf->Printf(&buf, "'%d',", it->value_sell); // weight - StrBuf->Printf(&buf, "'%u',", it->weight); + StrBuf->Printf(&buf, "'%d',", it->weight); // atk - StrBuf->Printf(&buf, "'%u',", it->atk); + StrBuf->Printf(&buf, "'%d',", it->atk); // matk - StrBuf->Printf(&buf, "'%u',", it->matk); + StrBuf->Printf(&buf, "'%d',", it->matk); // defence - StrBuf->Printf(&buf, "'%u',", it->def); + StrBuf->Printf(&buf, "'%d',", it->def); // range - StrBuf->Printf(&buf, "'%u',", it->range); + StrBuf->Printf(&buf, "'%d',", it->range); // slots - StrBuf->Printf(&buf, "'%u',", it->slot); + StrBuf->Printf(&buf, "'%d',", it->slot); // equip_jobs - if( libconfig->setting_lookup_int(entry, "Job", &i32) ) // This is an unsigned value, do not check for >= 0 - ui32 = (unsigned int)i32; + if (libconfig->setting_lookup_int(entry, "Job", &i32)) // This is an unsigned value, do not check for >= 0 + ui32 = (uint32)i32; else ui32 = UINT_MAX; StrBuf->Printf(&buf, "'%u',", ui32); // equip_upper - if( libconfig->setting_lookup_int(entry, "Upper", &i32) && i32 >= 0 ) - ui32 = (unsigned int)i32; + if (libconfig->setting_lookup_int(entry, "Upper", &i32) && i32 >= 0) + ui32 = (uint32)i32; else ui32 = ITEMUPPER_ALL; StrBuf->Printf(&buf, "'%u',", ui32); // equip_genders - StrBuf->Printf(&buf, "'%u',", it->sex); + StrBuf->Printf(&buf, "'%d',", it->sex); // equip_locations - StrBuf->Printf(&buf, "'%u',", it->equip); + StrBuf->Printf(&buf, "'%d',", it->equip); // weapon_level - StrBuf->Printf(&buf, "'%u',", it->wlv); + StrBuf->Printf(&buf, "'%d',", it->wlv); // equip_level_min - StrBuf->Printf(&buf, "'%u',", it->elv); + StrBuf->Printf(&buf, "'%d',", it->elv); // equip_level_max - if( (t = libconfig->setting_get_member(entry, "EquipLv")) && config_setting_is_aggregate(t) && libconfig->setting_length(t) >= 2 ) - StrBuf->Printf(&buf, "'%u',", it->elvmax); + if ((t = libconfig->setting_get_member(entry, "EquipLv")) && config_setting_is_aggregate(t) && libconfig->setting_length(t) >= 2) + StrBuf->Printf(&buf, "'%d',", it->elvmax); else StrBuf->AppendStr(&buf, "NULL,"); // refineable - StrBuf->Printf(&buf, "'%u',", it->flag.no_refine?0:1); + StrBuf->Printf(&buf, "'%d',", it->flag.no_refine?0:1); // view - StrBuf->Printf(&buf, "'%u',", it->look); + StrBuf->Printf(&buf, "'%d',", it->look); // bindonequip - StrBuf->Printf(&buf, "'%u',", it->flag.bindonequip?1:0); + StrBuf->Printf(&buf, "'%d',", it->flag.bindonequip?1:0); // forceserial - StrBuf->Printf(&buf, "'%u',", it->flag.force_serial?1:0); + StrBuf->Printf(&buf, "'%d',", it->flag.force_serial?1:0); // buyingstore - StrBuf->Printf(&buf, "'%u',", it->flag.buyingstore?1:0); + StrBuf->Printf(&buf, "'%d',", it->flag.buyingstore?1:0); // delay - StrBuf->Printf(&buf, "'%u',", it->delay); + StrBuf->Printf(&buf, "'%d',", it->delay); // trade_flag - StrBuf->Printf(&buf, "'%u',", it->flag.trade_restriction); + StrBuf->Printf(&buf, "'%d',", it->flag.trade_restriction); // trade_group if (it->flag.trade_restriction != ITR_NONE && it->gm_lv_trade_override > 0 && it->gm_lv_trade_override < 100) { - StrBuf->Printf(&buf, "'%u',", it->gm_lv_trade_override); + StrBuf->Printf(&buf, "'%d',", it->gm_lv_trade_override); } else { StrBuf->AppendStr(&buf, "NULL,"); } @@ -202,7 +266,7 @@ int db2sql(config_setting_t *entry, int n, const char *source) { // sprite if (it->flag.available) { - StrBuf->Printf(&buf, "'%u',", it->view_id); + StrBuf->Printf(&buf, "'%d',", it->view_id); } else { StrBuf->AppendStr(&buf, "NULL,"); } @@ -253,36 +317,15 @@ int db2sql(config_setting_t *entry, int n, const char *source) { return it?it->nameid:0; } -void totable(void) { - time_t t; - struct tm *lt; - t = time(NULL); - lt = localtime(&t); - int year = lt->tm_year+1900; - fprintf(tosql.fp, - "-- This file is part of Hercules.\n" - "-- http://herc.ws - http://github.com/HerculesWS/Hercules\n" - "--\n" - "-- Copyright (C) 2013-%d Hercules Dev Team\n" - "--\n" - "-- Hercules is free software: you can redistribute it and/or modify\n" - "-- it under the terms of the GNU General Public License as published by\n" - "-- the Free Software Foundation, either version 3 of the License, or\n" - "-- (at your option) any later version.\n" - "--\n" - "-- This program is distributed in the hope that it will be useful,\n" - "-- but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "-- GNU General Public License for more details.\n" - "--\n" - "-- You should have received a copy of the GNU General Public License\n" - "-- along with this program. If not, see <http://www.gnu.org/licenses/>.\n\n" - "-- NOTE: This file was auto-generated and should never be manually edited,\n" - "-- as it will get overwritten. If you need to modify this file,\n" - "-- please consider modifying the corresponding .conf file inside\n" - "-- the db folder, and then re-run the db2sql plugin.\n" - "\n" +/** + * Prints a SQL table header for the current item_db table. + */ +void itemdb2sql_tableheader(void) +{ + db2sql_fileheader(); + + fprintf(tosql.fp, "--\n" "-- Table structure for table `%s`\n" "--\n" @@ -326,79 +369,405 @@ void totable(void) { " `unequip_script` text,\n" " PRIMARY KEY (`id`)\n" ") ENGINE=MyISAM;\n" - "\n", year, tosql.db_name,tosql.db_name,tosql.db_name); + "\n", tosql.db_name,tosql.db_name,tosql.db_name); } -void do_db2sql(void) { + +/** + * Item DB Conversion. + * + * Converts Item DB and Item DB2 to SQL scripts. + */ +void do_itemdb2sql(void) +{ + int i; + struct convert_db_files { + const char *name; + const char *source; + const char *destination; + } files[] = { + {"item_db", DBPATH"item_db.conf", "sql-files/item_db" DBSUFFIX ".sql"}, + {"item_db2", "item_db2.conf", "sql-files/item_db2.sql"}, + }; + /* link */ itemdb_readdb_libconfig_sub = itemdb->readdb_libconfig_sub; - itemdb->readdb_libconfig_sub = db2sql; - /* */ + itemdb->readdb_libconfig_sub = itemdb2sql_sub; + + memset(&tosql.buf, 0, sizeof(tosql.buf)); + itemdb->clear(false); + + for (i = 0; i < ARRAYLENGTH(files); i++) { + if ((tosql.fp = fopen(files[i].destination, "wt+")) == NULL) { + ShowError("itemdb_tosql: File not found \"%s\".\n", files[i].destination); + return; + } + + tosql.db_name = files[i].name; + itemdb2sql_tableheader(); + + itemdb->readdb_libconfig(files[i].source); - if ((tosql.fp = fopen("sql-files/item_db_re.sql", "wt+")) == NULL) { - ShowError("itemdb_tosql: File not found \"%s\".\n", "sql-files/item_db_re.sql"); - return; + fclose(tosql.fp); } - tosql.db_name = "item_db"; - totable(); + /* unlink */ + itemdb->readdb_libconfig_sub = itemdb_readdb_libconfig_sub; - memset(&tosql.buf, 0, sizeof(tosql.buf) ); + for (i = 0; i < ARRAYLENGTH(tosql.buf); i++) { + if (tosql.buf[i].p) + aFree(tosql.buf[i].p); + } +} - itemdb->clear(false); - itemdb->readdb_libconfig("re/item_db.conf"); +/** + * Converts a Mob DB entry to SQL. + * + * @see mobdb_readdb_libconfig_sub. + */ +int mobdb2sql_sub(struct config_setting_t *mobt, int n, const char *source) +{ + struct mob_db *md = NULL; + nullpo_ret(mobt); + + if ((md = mob->db(mob_read_db_sub(mobt, n, source))) != mob->dummy) { + char e_name[NAME_LENGTH*2+1]; + StringBuf buf; + int card_idx = 9, i; + + StrBuf->Init(&buf); + + // id + StrBuf->Printf(&buf, "%d,", md->mob_id); - fclose(tosql.fp); + // Sprite + SQL->EscapeString(NULL, e_name, md->sprite); + StrBuf->Printf(&buf, "'%s',", e_name); + + // kName + SQL->EscapeString(NULL, e_name, md->name); + StrBuf->Printf(&buf, "'%s',", e_name); - if ((tosql.fp = fopen("sql-files/item_db.sql", "wt+")) == NULL) { - ShowError("itemdb_tosql: File not found \"%s\".\n", "sql-files/item_db.sql"); - return; + // iName + SQL->EscapeString(NULL, e_name, md->jname); + StrBuf->Printf(&buf, "'%s',", e_name); + + // LV + StrBuf->Printf(&buf, "%u,", md->lv); + + // HP + StrBuf->Printf(&buf, "%u,", md->status.max_hp); + + // SP + StrBuf->Printf(&buf, "%u,", md->status.max_sp); + + // EXP + StrBuf->Printf(&buf, "%u,", md->base_exp); + + // JEXP + StrBuf->Printf(&buf, "%u,", md->job_exp); + + // Range1 + StrBuf->Printf(&buf, "%u,", md->status.rhw.range); + + // ATK1 + StrBuf->Printf(&buf, "%u,", md->status.rhw.atk); + + // ATK2 + StrBuf->Printf(&buf, "%u,", md->status.rhw.atk2); + + // DEF + StrBuf->Printf(&buf, "%d,", md->status.def); + + // MDEF + StrBuf->Printf(&buf, "%d,", md->status.mdef); + + // STR + StrBuf->Printf(&buf, "%u,", md->status.str); + + // AGI + StrBuf->Printf(&buf, "%u,", md->status.agi); + + // VIT + StrBuf->Printf(&buf, "%u,", md->status.vit); + + // INT + StrBuf->Printf(&buf, "%u,", md->status.int_); + + // DEX + StrBuf->Printf(&buf, "%u,", md->status.dex); + + // LUK + StrBuf->Printf(&buf, "%u,", md->status.luk); + + // Range2 + StrBuf->Printf(&buf, "%d,", md->range2); + + // Range3 + StrBuf->Printf(&buf, "%d,", md->range3); + + // Scale + StrBuf->Printf(&buf, "%u,", md->status.size); + + // Race + StrBuf->Printf(&buf, "%u,", md->status.race); + + // Element + StrBuf->Printf(&buf, "%d,", md->status.def_ele + 20 * md->status.ele_lv); + + // Mode + StrBuf->Printf(&buf, "0x%X,", md->status.mode); + + // Speed + StrBuf->Printf(&buf, "%u,", md->status.speed); + + // aDelay + StrBuf->Printf(&buf, "%u,", md->status.adelay); + + // aMotion + StrBuf->Printf(&buf, "%u,", md->status.amotion); + + // dMotion + StrBuf->Printf(&buf, "%u,", md->status.dmotion); + + // MEXP + StrBuf->Printf(&buf, "%u,", md->mexp); + + for (i = 0; i < 3; i++) { + // MVP{i}id + StrBuf->Printf(&buf, "%d,", md->mvpitem[i].nameid); + // MVP{i}per + StrBuf->Printf(&buf, "%d,", md->mvpitem[i].p); + } + + // Scan for cards + for (i = 0; i < 10; i++) { + struct item_data *it = NULL; + if (md->dropitem[i].nameid != 0 && (it = itemdb->exists(md->dropitem[i].nameid)) != NULL && it->type == IT_CARD) + card_idx = i; + } + + for (i = 0; i < 10; i++) { + if (card_idx == i) + continue; + // Drop{i}id + StrBuf->Printf(&buf, "%d,", md->dropitem[i].nameid); + // Drop{i}per + StrBuf->Printf(&buf, "%d,", md->dropitem[i].p); + } + + // DropCardid + StrBuf->Printf(&buf, "%d,", md->dropitem[card_idx].nameid); + // DropCardper + StrBuf->Printf(&buf, "%d", md->dropitem[card_idx].p); + + fprintf(tosql.fp, "REPLACE INTO `%s` VALUES (%s);\n", tosql.db_name, StrBuf->Value(&buf)); + + StrBuf->Destroy(&buf); } - tosql.db_name = "item_db"; - totable(); + return md ? md->mob_id : 0; +} - itemdb->clear(false); - itemdb->readdb_libconfig("pre-re/item_db.conf"); +/** + * Prints a SQL table header for the current mob_db table. + */ +void mobdb2sql_tableheader(void) +{ + db2sql_fileheader(); + + fprintf(tosql.fp, + "--\n" + "-- Table structure for table `%s`\n" + "--\n" + "\n" + "DROP TABLE IF EXISTS `%s`;\n" + "CREATE TABLE `%s` (\n" + " `ID` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Sprite` TEXT NOT NULL,\n" + " `kName` TEXT NOT NULL,\n" + " `iName` TEXT NOT NULL,\n" + " `LV` TINYINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `HP` INT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `SP` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `EXP` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `JEXP` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Range1` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',\n" + " `ATK1` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `ATK2` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `DEF` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MDEF` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `STR` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `AGI` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `VIT` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `INT` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `DEX` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `LUK` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Range2` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Range3` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Scale` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Race` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Element` TINYINT(4) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Mode` INT(11) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Speed` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `aDelay` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `aMotion` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `dMotion` SMALLINT(6) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MEXP` MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MVP1id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MVP1per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MVP2id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MVP2per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MVP3id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `MVP3per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop1id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop1per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop2id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop2per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop3id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop3per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop4id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop4per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop5id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop5per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop6id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop6per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop7id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop7per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop8id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop8per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop9id` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `Drop9per` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `DropCardid` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " `DropCardper` SMALLINT(9) UNSIGNED NOT NULL DEFAULT '0',\n" + " PRIMARY KEY (`ID`)\n" + ") ENGINE=MyISAM;\n" + "\n", tosql.db_name, tosql.db_name, tosql.db_name); +} - fclose(tosql.fp); +/** + * Mob DB Conversion. + * + * Converts Mob DB and Mob DB2 to SQL scripts. + */ +void do_mobdb2sql(void) +{ + int i; + struct convert_db_files { + const char *name; + const char *source; + const char *destination; + } files[] = { + {"mob_db", DBPATH"mob_db.conf", "sql-files/mob_db" DBSUFFIX ".sql"}, + {"mob_db2", "mob_db2.conf", "sql-files/mob_db2.sql"}, + }; + + /* link */ + mob_read_db_sub = mob->read_db_sub; + mob->read_db_sub = mobdb2sql_sub; - if ((tosql.fp = fopen("sql-files/item_db2.sql", "wt+")) == NULL) { - ShowError("itemdb_tosql: File not found \"%s\".\n", "sql-files/item_db2.sql"); - return; + if (map->minimal) { + // Set up modifiers + battle->config_set_defaults(); } - tosql.db_name = "item_db2"; - totable(); + memset(&tosql.buf, 0, sizeof(tosql.buf)); + for (i = 0; i < ARRAYLENGTH(files); i++) { + if ((tosql.fp = fopen(files[i].destination, "wt+")) == NULL) { + ShowError("mobdb_tosql: File not found \"%s\".\n", files[i].destination); + return; + } - itemdb->clear(false); - itemdb->readdb_libconfig("item_db2.conf"); + tosql.db_name = files[i].name; + mobdb2sql_tableheader(); - fclose(tosql.fp); + mob->read_libconfig(files[i].source, false); + + fclose(tosql.fp); + } /* unlink */ - itemdb->readdb_libconfig_sub = itemdb_readdb_libconfig_sub; + mob->read_db_sub = mob_read_db_sub; + + for (i = 0; i < ARRAYLENGTH(tosql.buf); i++) { + if (tosql.buf[i].p) + aFree(tosql.buf[i].p); + } +} + +/** + * Console command db2sql. + */ +CPCMD(db2sql) +{ + do_itemdb2sql(); + do_mobdb2sql(); +} - if( tosql.buf[0].p ) aFree(tosql.buf[0].p); - if( tosql.buf[1].p ) aFree(tosql.buf[1].p); - if( tosql.buf[2].p ) aFree(tosql.buf[2].p); - if( tosql.buf[3].p ) aFree(tosql.buf[3].p); +/** + * Console command itemdb2sql. + */ +CPCMD(itemdb2sql) +{ + do_itemdb2sql(); } -CPCMD(db2sql) { - do_db2sql(); + +/** + * Console command mobdb2sql. + */ +CPCMD(mobdb2sql) +{ + do_mobdb2sql(); } + +/** + * Command line argument handler for --db2sql + */ CMDLINEARG(db2sql) { - map->minimal = torun = true; + map->minimal = true; + itemdb2sql_torun = true; + mobdb2sql_torun = true; return true; } -HPExport void server_preinit(void) { - addArg("--db2sql",false,db2sql,NULL); +/** + * Command line argument handler for --itemdb2sql + */ +CMDLINEARG(itemdb2sql) +{ + map->minimal = true; + itemdb2sql_torun = true; + return true; } -HPExport void plugin_init(void) { - addCPCommand("server:tools:db2sql",db2sql); + +/** + * Command line argument handler for --mobdb2sql + */ +CMDLINEARG(mobdb2sql) +{ + map->minimal = true; + mobdb2sql_torun = true; + return true; +} + +HPExport void server_preinit(void) +{ + addArg("--db2sql", false, db2sql, NULL); + addArg("--itemdb2sql", false, itemdb2sql, NULL); + addArg("--mobdb2sql", false, mobdb2sql, NULL); +} + +HPExport void plugin_init(void) +{ + addCPCommand("server:tools:db2sql", db2sql); + addCPCommand("server:tools:itemdb2sql", itemdb2sql); + addCPCommand("server:tools:mobdb2sql", mobdb2sql); } -HPExport void server_online(void) { - if( torun ) - do_db2sql(); + +HPExport void server_online(void) +{ + if (itemdb2sql_torun) + do_itemdb2sql(); + if (mobdb2sql_torun) + do_mobdb2sql(); } diff --git a/src/plugins/sample.c b/src/plugins/sample.c index 1ddecdc66..8fba2f4df 100644 --- a/src/plugins/sample.c +++ b/src/plugins/sample.c @@ -80,10 +80,10 @@ void sample_packet0f3(int fd) { data->lastMSGPosition.y = sd->status.last_point.y; data->someNumber = rand()%777; - ShowInfo("Created Appended sockt->session[] data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); + ShowInfo("Created Appended sockt->session[] data, %d %d %d %u\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); addToSession(sockt->session[fd],data,0,true); } else { - ShowInfo("Existent Appended sockt->session[] data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); + ShowInfo("Existent Appended sockt->session[] data, %d %d %d %u\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); if( rand()%4 == 2 ) { ShowInfo("Removing Appended sockt->session[] data\n"); removeFromSession(sockt->session[fd],0); @@ -99,10 +99,10 @@ void sample_packet0f3(int fd) { data->lastMSGPosition.y = sd->status.last_point.y; data->someNumber = rand()%777; - ShowInfo("Created Appended map_session_data data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); + ShowInfo("Created Appended map_session_data data, %d %d %d %u\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); addToMSD(sd,data,0,true); } else { - ShowInfo("Existent Appended map_session_data data, %d %d %d %d\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); + ShowInfo("Existent Appended map_session_data data, %d %d %d %u\n",data->lastMSGPosition.map,data->lastMSGPosition.x,data->lastMSGPosition.y,data->someNumber); if( rand()%4 == 2 ) { ShowInfo("Removing Appended map_session_data data\n"); removeFromMSD(sd,0); |