summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHercules.ws <Hercules@efficiently.awesome>2013-11-18 08:40:11 +0100
committerHerculesWSAPI <Hercules@efficiently.awesome>2013-11-18 08:40:11 +0100
commit3e9758706ecf80d7656daefb546c80bf6b549967 (patch)
tree941c185a48d99d7280a770f8824785715a38e0be
parentd92c113f9266f75bb4ee49a7e69b443018fb4c90 (diff)
downloadhercules-3e9758706ecf80d7656daefb546c80bf6b549967.tar.gz
hercules-3e9758706ecf80d7656daefb546c80bf6b549967.tar.bz2
hercules-3e9758706ecf80d7656daefb546c80bf6b549967.tar.xz
hercules-3e9758706ecf80d7656daefb546c80bf6b549967.zip
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
-rw-r--r--src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc16
-rw-r--r--src/plugins/HPMHooking/HPMHooking.HookingPoints.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Hooks.inc40
3 files changed, 30 insertions, 30 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index b77505fbb..992a6f144 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -2541,10 +2541,10 @@ struct {
struct HPMHookPoint *HP_itemdb_readdb_sql_sub_post;
struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_pre;
struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_post;
- struct HPMHookPoint *HP_itemdb_readdb_pre;
- struct HPMHookPoint *HP_itemdb_readdb_post;
- struct HPMHookPoint *HP_itemdb_read_sqldb_pre;
- struct HPMHookPoint *HP_itemdb_read_sqldb_post;
+ struct HPMHookPoint *HP_itemdb_readdb_libconfig_pre;
+ struct HPMHookPoint *HP_itemdb_readdb_libconfig_post;
+ struct HPMHookPoint *HP_itemdb_readdb_sql_pre;
+ struct HPMHookPoint *HP_itemdb_readdb_sql_post;
struct HPMHookPoint *HP_itemdb_unique_id_pre;
struct HPMHookPoint *HP_itemdb_unique_id_post;
struct HPMHookPoint *HP_itemdb_uid_load_pre;
@@ -7500,10 +7500,10 @@ struct {
int HP_itemdb_readdb_sql_sub_post;
int HP_itemdb_readdb_libconfig_sub_pre;
int HP_itemdb_readdb_libconfig_sub_post;
- int HP_itemdb_readdb_pre;
- int HP_itemdb_readdb_post;
- int HP_itemdb_read_sqldb_pre;
- int HP_itemdb_read_sqldb_post;
+ int HP_itemdb_readdb_libconfig_pre;
+ int HP_itemdb_readdb_libconfig_post;
+ int HP_itemdb_readdb_sql_pre;
+ int HP_itemdb_readdb_sql_post;
int HP_itemdb_unique_id_pre;
int HP_itemdb_unique_id_post;
int HP_itemdb_uid_load_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 57c243913..ff9d78ed3 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -1289,8 +1289,8 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(itemdb->validate_entry, HP_itemdb_validate_entry) },
{ HP_POP(itemdb->readdb_sql_sub, HP_itemdb_readdb_sql_sub) },
{ HP_POP(itemdb->readdb_libconfig_sub, HP_itemdb_readdb_libconfig_sub) },
- { HP_POP(itemdb->readdb, HP_itemdb_readdb) },
- { HP_POP(itemdb->read_sqldb, HP_itemdb_read_sqldb) },
+ { HP_POP(itemdb->readdb_libconfig, HP_itemdb_readdb_libconfig) },
+ { HP_POP(itemdb->readdb_sql, HP_itemdb_readdb_sql) },
{ HP_POP(itemdb->unique_id, HP_itemdb_unique_id) },
{ HP_POP(itemdb->uid_load, HP_itemdb_uid_load) },
{ HP_POP(itemdb->read, HP_itemdb_read) },
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 5511959e9..8665b1e5a 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -32402,13 +32402,13 @@ int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *sour
}
return retVal___;
}
-int HP_itemdb_readdb(const char *filename) {
+int HP_itemdb_readdb_libconfig(const char *filename) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_itemdb_readdb_pre ) {
+ if( HPMHooks.count.HP_itemdb_readdb_libconfig_pre ) {
int (*preHookFunc) (const char *filename);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_itemdb_readdb_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_pre[hIndex].func;
retVal___ = preHookFunc(filename);
}
if( *HPMforce_return ) {
@@ -32417,25 +32417,25 @@ int HP_itemdb_readdb(const char *filename) {
}
}
{
- retVal___ = HPMHooks.source.itemdb.readdb(filename);
+ retVal___ = HPMHooks.source.itemdb.readdb_libconfig(filename);
}
- if( HPMHooks.count.HP_itemdb_readdb_post ) {
+ if( HPMHooks.count.HP_itemdb_readdb_libconfig_post ) {
int (*postHookFunc) (int retVal___, const char *filename);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_itemdb_readdb_post[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_post[hIndex].func;
retVal___ = postHookFunc(retVal___, filename);
}
}
return retVal___;
}
-int HP_itemdb_read_sqldb(void) {
+int HP_itemdb_readdb_sql(const char *tablename) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_itemdb_read_sqldb_pre ) {
- int (*preHookFunc) (void);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_sqldb_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_itemdb_read_sqldb_pre[hIndex].func;
- retVal___ = preHookFunc();
+ if( HPMHooks.count.HP_itemdb_readdb_sql_pre ) {
+ int (*preHookFunc) (const char *tablename);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_pre[hIndex].func;
+ retVal___ = preHookFunc(tablename);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -32443,13 +32443,13 @@ int HP_itemdb_read_sqldb(void) {
}
}
{
- retVal___ = HPMHooks.source.itemdb.read_sqldb();
+ retVal___ = HPMHooks.source.itemdb.readdb_sql(tablename);
}
- if( HPMHooks.count.HP_itemdb_read_sqldb_post ) {
- int (*postHookFunc) (int retVal___);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_read_sqldb_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_itemdb_read_sqldb_post[hIndex].func;
- retVal___ = postHookFunc(retVal___);
+ if( HPMHooks.count.HP_itemdb_readdb_sql_post ) {
+ int (*postHookFunc) (int retVal___, const char *tablename);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, tablename);
}
}
return retVal___;