Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline

1 files changed, 8 insertions, 8 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 0f44460..39e62da 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -576,9 +576,9 @@ void log_atcommand(struct map_session_data *sd, const char *fmt, ...)
 		sprintf(fullname, "%s.%04d-%02d", gm_logfile_name, year, month);
 
 		if (gm_logfile)
-			fclose(gm_logfile);
+			fclose_(gm_logfile);
 
-		gm_logfile = fopen(fullname, "a");
+		gm_logfile = fopen_(fullname, "a");
 		free(fullname);
 
 		if (!gm_logfile) {
@@ -731,7 +731,7 @@ int msg_config_read(const char *cfgName) {
 	char line[1024], w1[1024], w2[1024];
 	FILE *fp;
 
-	if ((fp = fopen(cfgName, "r")) == NULL) {
+	if ((fp = fopen_(cfgName, "r")) == NULL) {
 		printf("Messages file not found: %s\n", cfgName);
 		return 1;
 	}
@@ -750,7 +750,7 @@ int msg_config_read(const char *cfgName) {
 			}
 		}
 	}
-	fclose(fp);
+	fclose_(fp);
 
 	return 0;
 }
@@ -778,7 +778,7 @@ int atcommand_config_read(const char *cfgName) {
 	AtCommandInfo* p;
 	FILE* fp;
 
-	if ((fp = fopen(cfgName, "r")) == NULL) {
+	if ((fp = fopen_(cfgName, "r")) == NULL) {
 		printf("At commands configuration file not found: %s\n", cfgName);
 		return 1;
 	}
@@ -805,7 +805,7 @@ int atcommand_config_read(const char *cfgName) {
 		         w2[0] != '%') // symbol of party chat speaking
 			command_symbol = w2[0];
 	}
-	fclose(fp);
+	fclose_(fp);
 
 	return 0;
 }
@@ -1973,7 +1973,7 @@ int atcommand_help(
 
 	memset(buf, '\0', sizeof(buf));
 
-	if ((fp = fopen(help_txt, "r")) != NULL) {
+	if ((fp = fopen_(help_txt, "r")) != NULL) {
 		clif_displaymessage(fd, msg_table[26]); // Help commands:
 		gm_level = pc_isGM(sd);
 		while(fgets(buf, sizeof(buf) - 1, fp) != NULL) {
@@ -1990,7 +1990,7 @@ int atcommand_help(
 			else if (gm_level >= atoi(w1))
 				clif_displaymessage(fd, w2);
 		}
-		fclose(fp);
+		fclose_(fp);
 	} else {
 		clif_displaymessage(fd, msg_table[27]); // File help.txt not found.
 		return -1;