Modified showmsg code to not attach a timestamp to MSG_NONE-type messages, generated by ShowMessage(). It now works exactly like printf().

Removed/replaced all printf calls in the code.
Added a new flag to setting 'console_silent', for filtering debug messages.
Silenced the "Broken pipe found" and "Server running in debug mode" messages.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12020 54d463be-8e91-2dee-dedb-b68131a5f0ec

7 files changed, 9 insertions, 26 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 717b1117e..e43ea9e7c 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2058,7 +2058,6 @@ int parse_fromlogin(int fd)
 			WBUFL(buf,2) = RFIFOL(fd,2); // account
 			WBUFL(buf,6) = RFIFOL(fd,6); // GM level
 			mapif_sendall(buf,10);
-//			printf("parse_fromlogin: To become GM answer: char -> map.\n");
 
 			RFIFOSKIP(fd,10);
 		}
@@ -2892,7 +2891,6 @@ int parse_frommap(int fd)
 		case 0x2b0a: // request to become GM
 			if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd,2))
 				return 0;
-//			printf("parse_frommap: change gm -> login, account: %d, pass: '%s'.\n", RFIFOL(fd,4), RFIFOP(fd,8));
 			if (login_fd > 0) { // don't send request if no login-server
 				WFIFOHEAD(login_fd, RFIFOW(fd,2));
 				WFIFOW(login_fd,0) = 0x2720;
@@ -3704,19 +3702,19 @@ int parse_console(char* buf)
 	//login_log("Console command :%s\n", command);
 
 	if( strcmpi("shutdown", command) == 0 ||
-		strcmpi("exit", command) == 0 ||
-		strcmpi("quit", command) == 0 ||
-		strcmpi("end", command) == 0 )
+	    strcmpi("exit", command) == 0 ||
+	    strcmpi("quit", command) == 0 ||
+	    strcmpi("end", command) == 0 )
 		runflag = 0;
 	else if( strcmpi("alive", command) == 0 ||
-			strcmpi("status", command) == 0 )
+	         strcmpi("status", command) == 0 )
 		ShowInfo(CL_CYAN"Console: "CL_BOLD"I'm Alive."CL_RESET"\n");
 	else if( strcmpi("help", command) == 0 ){
-		printf(CL_BOLD"Help of commands:"CL_RESET"\n");
-		printf("  To shutdown the server:\n");
-		printf("  'shutdown|exit|qui|end'\n");
-		printf("  To know if server is alive:\n");
-		printf("  'alive|status'\n");
+		ShowInfo(CL_BOLD"Help of commands:"CL_RESET"\n");
+		ShowInfo("  To shutdown the server:\n");
+		ShowInfo("  'shutdown|exit|qui|end'\n");
+		ShowInfo("  To know if server is alive:\n");
+		ShowInfo("  'alive|status'\n");
 	}
 
 	return 0;
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index f1d9c7429..2e2933c14 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -431,7 +431,6 @@ int inter_guild_init()
 		c++;
 	}
 	fclose(fp);
-//	printf("int_guild: %s read done (%d guilds)\n", guild_txt, c);
 
 	c = 0;//カウンタ初期化
 
diff --git a/src/char/int_homun.c b/src/char/int_homun.c
index be0dcd087..49434cd90 100644
--- a/src/char/int_homun.c
+++ b/src/char/int_homun.c
@@ -140,7 +140,6 @@ int inter_homun_init()
 		c++;
 	}
 	fclose(fp);
-//	printf("int_homun: %s read done (%d homuns)\n",homun_txt,c);
 	return 0;
 }
 
@@ -170,7 +169,6 @@ int inter_homun_save()
 	}
 	homun_db->foreach(homun_db,inter_homun_save_sub,fp);
 	lock_fclose(fp,homun_txt,&lock);
-//	printf("int_homun: %s saved.\n",homun_txt);
 	return 0;
 }
 
diff --git a/src/char/int_party.c b/src/char/int_party.c
index 7e71adb64..50d6b0d6a 100644
--- a/src/char/int_party.c
+++ b/src/char/int_party.c
@@ -127,7 +127,6 @@ int inter_party_fromstr(char *str, struct party *p) {
 	
 	memset(p, 0, sizeof(struct party));
 
-//	printf("sscanf party main info\n");
 	if (sscanf(str, "%d\t%255[^\t]\t%d,%d\t", &tmp_int[0], tmp_str, &tmp_int[1], &tmp_int[2]) != 4)
 		return 1;
 
@@ -135,7 +134,6 @@ int inter_party_fromstr(char *str, struct party *p) {
 	memcpy(p->name, tmp_str, NAME_LENGTH);
 	p->exp = tmp_int[1]?1:0;
 	p->item = tmp_int[2];
-//	printf("%d [%s] %d %d\n", tmp_int[0], tmp_str[0], tmp_int[1], tmp_int[2]);
 
 	for(j = 0; j < 3 && str != NULL; j++)
 		str = strchr(str + 1, '\t');
@@ -144,7 +142,6 @@ int inter_party_fromstr(char *str, struct party *p) {
 		struct party_member *m = &p->member[i];
 		if (str == NULL)
 			return 1;
-//		printf("sscanf party member info %d\n", i);
 
 		if (sscanf(str + 1, "%d,%d,%d\t", &tmp_int[0], &tmp_int[1], &tmp_int[2]) != 3)
 			return 1;
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index 2f06e2df5..59c705620 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -49,7 +49,6 @@ int inter_pet_fromstr(char *str,struct s_pet *p)
 
 	memset(p,0,sizeof(struct s_pet));
 
-//	printf("sscanf pet main info\n");
 	s=sscanf(str,"%d,%d,%[^\t]\t%d,%d,%d,%d,%d,%d,%d,%d,%d",&tmp_int[0],&tmp_int[1],tmp_str,&tmp_int[2],
 		&tmp_int[3],&tmp_int[4],&tmp_int[5],&tmp_int[6],&tmp_int[7],&tmp_int[8],&tmp_int[9],&tmp_int[10]);
 
@@ -111,7 +110,6 @@ int inter_pet_init()
 		c++;
 	}
 	fclose(fp);
-//	printf("int_pet: %s read done (%d pets)\n",pet_txt,c);
 	return 0;
 }
 
@@ -141,7 +139,6 @@ int inter_pet_save()
 	}
 	pet_db->foreach(pet_db,inter_pet_save_sub,fp);
 	lock_fclose(fp,pet_txt,&lock);
-//	printf("int_pet: %s saved.\n",pet_txt);
 	return 0;
 }
 
diff --git a/src/char/int_storage.c b/src/char/int_storage.c
index cba4a28a9..4aefd231b 100644
--- a/src/char/int_storage.c
+++ b/src/char/int_storage.c
@@ -286,7 +286,6 @@ int inter_storage_save()
 	}
 	storage_db->foreach(storage_db,inter_storage_save_sub,fp);
 	lock_fclose(fp,storage_txt,&lock);
-//	printf("int_storage: %s saved.\n",storage_txt);
 	return 0;
 }
 
@@ -314,7 +313,6 @@ int inter_guild_storage_save()
 	}
 	guild_storage_db->foreach(guild_storage_db,inter_guild_storage_save_sub,fp);
 	lock_fclose(fp,guild_storage_txt,&lock);
-//	printf("int_storage: %s saved.\n",guild_storage_txt);
 	return 0;
 }
 
diff --git a/src/char/inter.c b/src/char/inter.c
index 85b4793f7..4e617c1e6 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -129,7 +129,6 @@ int inter_accreg_init(void) {
 		c++;
 	}
 	fclose(fp);
-//	printf("inter: %s read done (%d)\n", accreg_txt, c);
 
 	return 0;
 }
@@ -160,7 +159,6 @@ int inter_accreg_save(void) {
 	}
 	accreg_db->foreach(accreg_db, inter_accreg_save_sub,fp);
 	lock_fclose(fp, accreg_txt, &lock);
-//	printf("inter: %s saved.\n", accreg_txt);
 
 	return 0;
 }
@@ -316,7 +314,6 @@ int mapif_GMmessage(unsigned char *mes, int len, unsigned long color, int sfd) {
 	WBUFL(buf,4) = color;
 	memcpy(WBUFP(buf,8), mes, len - 8);
 	mapif_sendallwos(sfd, buf, len);
-//	printf("inter server: GM:%d %s\n", len, mes);
 
 	return 0;
 }
@@ -369,7 +366,6 @@ int mapif_wis_end(struct WisData *wd, int flag) {
 	memcpy(WBUFP(buf, 2), wd->src, 24);
 	WBUFB(buf,26) = flag; // flag: 0: success to send wisper, 1: target character is not loged in?, 2: ignored by target
 	mapif_send(wd->fd, buf, 27);
-//	printf("inter server wis_end: flag: %d\n", flag);
 
 	return 0;
 }