6 files changed, 14 insertions, 14 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 0b8c3c9d9..b2fc12ddb 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -840,7 +840,7 @@ int make_new_char(int fd, unsigned char *dat) {
 
 	// remove control characters from the name
 	dat[23] = '\0';
-	if (remove_control_chars((char*)dat)) {
+	if (remove_control_chars((unsigned char *)(char*)dat)) {
 		char_log("Make new char error (control char received in the name): (connection #%d, account: %d)." RETCODE,
 		         fd, sd->account_id);
 		return -1;
@@ -1828,7 +1828,7 @@ int parse_tologin(int fd) {
 					memset(message, '\0', sizeof(message));
 					memcpy(message, RFIFOP(fd,8), RFIFOL(fd,4));
 					message[sizeof(message)-1] = '\0';
-					remove_control_chars(message);
+					remove_control_chars((unsigned char *)message);
 					// remove all first spaces
 					p = message;
 					while(p[0] == ' ')
@@ -3190,8 +3190,8 @@ int lan_config_read(const char *lancfgName) {
 		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
 			continue;
 
-		remove_control_chars(w1);
-		remove_control_chars(w2);
+		remove_control_chars((unsigned char *)w1);
+		remove_control_chars((unsigned char *)w2);
 		if (strcmpi(w1, "lan_map_ip") == 0) { // Read map-server Lan IP Address
 			h = gethostbyname(w2);
 			if (h != NULL) {
@@ -3262,8 +3262,8 @@ int char_config_read(const char *cfgName) {
 		if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) != 2)
 			continue;
 
-		remove_control_chars(w1);
-		remove_control_chars(w2);
+		remove_control_chars((unsigned char *)w1);
+		remove_control_chars((unsigned char *)w2);
 		if (strcmpi(w1, "userid") == 0) {
 			memcpy(userid, w2, 24);
 		} else if (strcmpi(w1, "passwd") == 0) {
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 78e6b476f..8b9de1a89 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -490,13 +490,13 @@ int inter_guild_init() {
 
 int castle_db_final (void *k, void *data, va_list ap)
 {
-	struct guild_castle *gc = data;
+	struct guild_castle *gc = (struct guild_castle *) data;
 	if (gc) aFree(gc);
 	return 0;
 }
 int guild_db_final (void *k, void *data, va_list ap)
 {
-	struct guild *g = data;
+	struct guild *g = (struct guild *) data;
 	if (g) aFree(g);
 	return 0;
 }
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 5ee48fc70..8c87f2cb4 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -118,7 +118,7 @@ int inter_party_init() {
 }
 
 int party_db_final (void *k, void *data, va_list ap) {
-	struct party *p = data;
+	struct party *p = (struct party *) data;
 	if (p) aFree(p);
 	return 0;
 }
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 342854f8b..ab53d0533 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -110,7 +110,7 @@ int inter_pet_init()
 }
 
 int pet_db_final (void *k, void *data, va_list ap) {
-	struct s_pet *p = data;
+	struct s_pet *p = (struct s_pet *) data;
 	if (p) aFree(p);
 	return 0;
 }
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index 498004bc0..eaf9e001a 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -292,12 +292,12 @@ int inter_storage_init()
 }
 
 int storage_db_final (void *k, void *data, va_list ap) {
-	struct storage *p = data;
+	struct storage *p = (struct storage *) data;
 	if (p) aFree(p);
 	return 0;
 }
 int guild_storage_db_final (void *k, void *data, va_list ap) {
-	struct guild_storage *p = data;
+	struct guild_storage *p = (struct guild_storage *) data;
 	if (p) aFree(p);
 	return 0;
 }
diff --git a/src/char/inter.c b/src/char/inter.c
index 3a388ea82..a6893aecc 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -263,12 +263,12 @@ int inter_init(const char *file) {
 
 // finalize
 int accreg_db_final (void *k, void *data, va_list ap) {	
-	struct accreg *p = data;
+	struct accreg *p = (struct accreg *) data;
 	if (p) aFree(p);
 	return 0;
 }
 int wis_db_final (void *k, void *data, va_list ap) {
-	struct WisData *p = data;
+	struct WisData *p = (struct WisData *) data;
 	if (p) aFree(p);
 	return 0;
 }