Skip to content

Commit 6ea8e59

Browse files
committed
HPM Hooks Update
1 parent 7c88915 commit 6ea8e59

File tree

4 files changed

+121
-19
lines changed

4 files changed

+121
-19
lines changed

src/plugins/HPMHooking/HPMHooking.Defs.inc

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7934,8 +7934,14 @@ typedef bool (*HPMHOOK_pre_status_readdb_job2) (char **fields[], int *columns, i
79347934
typedef bool (*HPMHOOK_post_status_readdb_job2) (bool retVal___, char *fields[], int columns, int current);
79357935
typedef bool (*HPMHOOK_pre_status_readdb_sizefix) (char **fields[], int *columns, int *current);
79367936
typedef bool (*HPMHOOK_post_status_readdb_sizefix) (bool retVal___, char *fields[], int columns, int current);
7937-
typedef bool (*HPMHOOK_pre_status_readdb_scconfig) (char **fields[], int *columns, int *current);
7938-
typedef bool (*HPMHOOK_post_status_readdb_scconfig) (bool retVal___, char *fields[], int columns, int current);
7937+
typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig) (void);
7938+
typedef bool (*HPMHOOK_post_status_read_scdb_libconfig) (bool retVal___);
7939+
typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub) (struct config_setting_t **it, int *idx, const char **source);
7940+
typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
7941+
typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub_flag) (struct config_setting_t **it, int *type, const char **source);
7942+
typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub_flag) (bool retVal___, struct config_setting_t *it, int type, const char *source);
7943+
typedef bool (*HPMHOOK_pre_status_read_scdb_libconfig_sub_flag_additional) (struct config_setting_t **it, int *type, const char **source);
7944+
typedef bool (*HPMHOOK_post_status_read_scdb_libconfig_sub_flag_additional) (bool retVal___, struct config_setting_t *it, int type, const char *source);
79397945
typedef void (*HPMHOOK_pre_status_read_job_db) (void);
79407946
typedef void (*HPMHOOK_post_status_read_job_db) (void);
79417947
typedef void (*HPMHOOK_pre_status_read_job_db_sub) (int *idx, const char **name, struct config_setting_t **jdb);

src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6456,8 +6456,14 @@ struct {
64566456
struct HPMHookPoint *HP_status_readdb_job2_post;
64576457
struct HPMHookPoint *HP_status_readdb_sizefix_pre;
64586458
struct HPMHookPoint *HP_status_readdb_sizefix_post;
6459-
struct HPMHookPoint *HP_status_readdb_scconfig_pre;
6460-
struct HPMHookPoint *HP_status_readdb_scconfig_post;
6459+
struct HPMHookPoint *HP_status_read_scdb_libconfig_pre;
6460+
struct HPMHookPoint *HP_status_read_scdb_libconfig_post;
6461+
struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_pre;
6462+
struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_post;
6463+
struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_pre;
6464+
struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_post;
6465+
struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_additional_pre;
6466+
struct HPMHookPoint *HP_status_read_scdb_libconfig_sub_flag_additional_post;
64616467
struct HPMHookPoint *HP_status_read_job_db_pre;
64626468
struct HPMHookPoint *HP_status_read_job_db_post;
64636469
struct HPMHookPoint *HP_status_read_job_db_sub_pre;
@@ -13227,8 +13233,14 @@ struct {
1322713233
int HP_status_readdb_job2_post;
1322813234
int HP_status_readdb_sizefix_pre;
1322913235
int HP_status_readdb_sizefix_post;
13230-
int HP_status_readdb_scconfig_pre;
13231-
int HP_status_readdb_scconfig_post;
13236+
int HP_status_read_scdb_libconfig_pre;
13237+
int HP_status_read_scdb_libconfig_post;
13238+
int HP_status_read_scdb_libconfig_sub_pre;
13239+
int HP_status_read_scdb_libconfig_sub_post;
13240+
int HP_status_read_scdb_libconfig_sub_flag_pre;
13241+
int HP_status_read_scdb_libconfig_sub_flag_post;
13242+
int HP_status_read_scdb_libconfig_sub_flag_additional_pre;
13243+
int HP_status_read_scdb_libconfig_sub_flag_additional_post;
1323213244
int HP_status_read_job_db_pre;
1323313245
int HP_status_read_job_db_post;
1323413246
int HP_status_read_job_db_sub_pre;

src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3300,7 +3300,10 @@ struct HookingPointData HookingPoints[] = {
33003300
{ HP_POP(status->natural_heal_timer, HP_status_natural_heal_timer) },
33013301
{ HP_POP(status->readdb_job2, HP_status_readdb_job2) },
33023302
{ HP_POP(status->readdb_sizefix, HP_status_readdb_sizefix) },
3303-
{ HP_POP(status->readdb_scconfig, HP_status_readdb_scconfig) },
3303+
{ HP_POP(status->read_scdb_libconfig, HP_status_read_scdb_libconfig) },
3304+
{ HP_POP(status->read_scdb_libconfig_sub, HP_status_read_scdb_libconfig_sub) },
3305+
{ HP_POP(status->read_scdb_libconfig_sub_flag, HP_status_read_scdb_libconfig_sub_flag) },
3306+
{ HP_POP(status->read_scdb_libconfig_sub_flag_additional, HP_status_read_scdb_libconfig_sub_flag_additional) },
33043307
{ HP_POP(status->read_job_db, HP_status_read_job_db) },
33053308
{ HP_POP(status->read_job_db_sub, HP_status_read_job_db_sub) },
33063309
{ HP_POP(status->set_sc, HP_status_set_sc) },

src/plugins/HPMHooking/HPMHooking_map.Hooks.inc

Lines changed: 93 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86386,29 +86386,110 @@ bool HP_status_readdb_sizefix(char *fields[], int columns, int current) {
8638686386
}
8638786387
return retVal___;
8638886388
}
86389-
bool HP_status_readdb_scconfig(char *fields[], int columns, int current) {
86389+
bool HP_status_read_scdb_libconfig(void) {
8639086390
int hIndex = 0;
8639186391
bool retVal___ = false;
86392-
if (HPMHooks.count.HP_status_readdb_scconfig_pre > 0) {
86393-
bool (*preHookFunc) (char **fields[], int *columns, int *current);
86392+
if (HPMHooks.count.HP_status_read_scdb_libconfig_pre > 0) {
86393+
bool (*preHookFunc) (void);
8639486394
*HPMforce_return = false;
86395-
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_pre; hIndex++) {
86396-
preHookFunc = HPMHooks.list.HP_status_readdb_scconfig_pre[hIndex].func;
86397-
retVal___ = preHookFunc(&fields, &columns, &current);
86395+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_pre; hIndex++) {
86396+
preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_pre[hIndex].func;
86397+
retVal___ = preHookFunc();
8639886398
}
8639986399
if (*HPMforce_return) {
8640086400
*HPMforce_return = false;
8640186401
return retVal___;
8640286402
}
8640386403
}
8640486404
{
86405-
retVal___ = HPMHooks.source.status.readdb_scconfig(fields, columns, current);
86405+
retVal___ = HPMHooks.source.status.read_scdb_libconfig();
8640686406
}
86407-
if (HPMHooks.count.HP_status_readdb_scconfig_post > 0) {
86408-
bool (*postHookFunc) (bool retVal___, char *fields[], int columns, int current);
86409-
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_scconfig_post; hIndex++) {
86410-
postHookFunc = HPMHooks.list.HP_status_readdb_scconfig_post[hIndex].func;
86411-
retVal___ = postHookFunc(retVal___, fields, columns, current);
86407+
if (HPMHooks.count.HP_status_read_scdb_libconfig_post > 0) {
86408+
bool (*postHookFunc) (bool retVal___);
86409+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_post; hIndex++) {
86410+
postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_post[hIndex].func;
86411+
retVal___ = postHookFunc(retVal___);
86412+
}
86413+
}
86414+
return retVal___;
86415+
}
86416+
bool HP_status_read_scdb_libconfig_sub(struct config_setting_t *it, int idx, const char *source) {
86417+
int hIndex = 0;
86418+
bool retVal___ = false;
86419+
if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_pre > 0) {
86420+
bool (*preHookFunc) (struct config_setting_t **it, int *idx, const char **source);
86421+
*HPMforce_return = false;
86422+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_pre; hIndex++) {
86423+
preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_pre[hIndex].func;
86424+
retVal___ = preHookFunc(&it, &idx, &source);
86425+
}
86426+
if (*HPMforce_return) {
86427+
*HPMforce_return = false;
86428+
return retVal___;
86429+
}
86430+
}
86431+
{
86432+
retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub(it, idx, source);
86433+
}
86434+
if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_post > 0) {
86435+
bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int idx, const char *source);
86436+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_post; hIndex++) {
86437+
postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_post[hIndex].func;
86438+
retVal___ = postHookFunc(retVal___, it, idx, source);
86439+
}
86440+
}
86441+
return retVal___;
86442+
}
86443+
bool HP_status_read_scdb_libconfig_sub_flag(struct config_setting_t *it, int type, const char *source) {
86444+
int hIndex = 0;
86445+
bool retVal___ = false;
86446+
if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_pre > 0) {
86447+
bool (*preHookFunc) (struct config_setting_t **it, int *type, const char **source);
86448+
*HPMforce_return = false;
86449+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_pre; hIndex++) {
86450+
preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_pre[hIndex].func;
86451+
retVal___ = preHookFunc(&it, &type, &source);
86452+
}
86453+
if (*HPMforce_return) {
86454+
*HPMforce_return = false;
86455+
return retVal___;
86456+
}
86457+
}
86458+
{
86459+
retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub_flag(it, type, source);
86460+
}
86461+
if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_post > 0) {
86462+
bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int type, const char *source);
86463+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_post; hIndex++) {
86464+
postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_post[hIndex].func;
86465+
retVal___ = postHookFunc(retVal___, it, type, source);
86466+
}
86467+
}
86468+
return retVal___;
86469+
}
86470+
bool HP_status_read_scdb_libconfig_sub_flag_additional(struct config_setting_t *it, int type, const char *source) {
86471+
int hIndex = 0;
86472+
bool retVal___ = false;
86473+
if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_pre > 0) {
86474+
bool (*preHookFunc) (struct config_setting_t **it, int *type, const char **source);
86475+
*HPMforce_return = false;
86476+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_pre; hIndex++) {
86477+
preHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_additional_pre[hIndex].func;
86478+
retVal___ = preHookFunc(&it, &type, &source);
86479+
}
86480+
if (*HPMforce_return) {
86481+
*HPMforce_return = false;
86482+
return retVal___;
86483+
}
86484+
}
86485+
{
86486+
retVal___ = HPMHooks.source.status.read_scdb_libconfig_sub_flag_additional(it, type, source);
86487+
}
86488+
if (HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_post > 0) {
86489+
bool (*postHookFunc) (bool retVal___, struct config_setting_t *it, int type, const char *source);
86490+
for (hIndex = 0; hIndex < HPMHooks.count.HP_status_read_scdb_libconfig_sub_flag_additional_post; hIndex++) {
86491+
postHookFunc = HPMHooks.list.HP_status_read_scdb_libconfig_sub_flag_additional_post[hIndex].func;
86492+
retVal___ = postHookFunc(retVal___, it, type, source);
8641286493
}
8641386494
}
8641486495
return retVal___;

0 commit comments

Comments
 (0)