Cleanup of the HPluginData implementation (First part)

- Several explicit casts are removed, to have a slightly better
  type-checking at compile time.
- A destructor function is provided, to remove code duplication.

Signed-off-by: Haru <haru@dotalux.com>

2 files changed, 13 insertions, 6 deletions

diff --git a/src/char/HPMchar.c b/src/char/HPMchar.c
index a67f017c1..14d7be1a3 100644
--- a/src/char/HPMchar.c
+++ b/src/char/HPMchar.c
@@ -47,13 +47,18 @@
 // HPMDataCheck comes after all the other includes
 #include "common/HPMDataCheck.h"
 
-bool HPM_char_grabHPData(struct HPDataOperationStorage *ret, enum HPluginDataTypes type, void *ptr) {
-	/* record address */
-	switch( type ) {
+/**
+ * HPM plugin data store validator sub-handler (char-server)
+ *
+ * @see HPM_interface::data_store_validate
+ */
+bool HPM_char_data_store_validate(enum HPluginDataTypes type, struct hplugin_data_store **store)
+{
+	switch (type) {
 		default:
-			return false;
+			break;
 	}
-	return true;
+	return false;
 }
 
 void HPM_char_plugin_load_sub(struct hplugin *plugin) {
@@ -61,6 +66,8 @@ void HPM_char_plugin_load_sub(struct hplugin *plugin) {
 }
 
 void HPM_char_do_init(void) {
+	HPM->load_sub = HPM_char_plugin_load_sub;
+	HPM->data_store_validate_sub = HPM_char_data_store_validate;
 	HPM->datacheck_init(HPMDataCheck, HPMDataCheckLen, HPMDataCheckVer);
 	HPM_shared_symbols(SERVER_TYPE_CHAR);
 }
diff --git a/src/char/HPMchar.h b/src/char/HPMchar.h
index e3e000ef3..fd07f45ed 100644
--- a/src/char/HPMchar.h
+++ b/src/char/HPMchar.h
@@ -13,7 +13,7 @@
 
 struct hplugin;
 
-bool HPM_char_grabHPData(struct HPDataOperationStorage *ret, enum HPluginDataTypes type, void *ptr);
+bool HPM_char_data_store_validate(enum HPluginDataTypes type, struct hplugin_data_store **store);
 
 void HPM_char_plugin_load_sub(struct hplugin *plugin);