From f70d54001cd1b975db6f4668a6d54dbae7a8ac92 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 26 Dec 2014 16:35:12 +0300
Subject: Improve performance a bit by removing strlen(str) > 0.

---
 src/map/atcommand.c | 3 ++-
 src/map/irc-bot.c   | 3 ++-
 src/map/log.c       | 2 +-
 src/map/map.c       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/map')

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d43637b81..6f97141b2 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8740,10 +8740,11 @@ ACMD(channel) {
 
 	if (strcmpi(subcmd,"create") == 0 && (clif->hChSys->allow_user_channel_creation || pc_has_permission(sd, PC_PERM_HCHSYS_ADMIN))) {
 		// sub1 = channel name; sub2 = password; sub3 = unused
+		size_t len = strlen(sub1);
 		if (sub1[0] != '#') {
 			clif->message(fd, msg_txt(1405));// Channel name must start with a '#'
 			return false;
-		} else if (strlen(sub1) < 3 || strlen(sub1) > HCHSYS_NAME_LENGTH) {
+		} else if (len < 3 || len > HCHSYS_NAME_LENGTH) {
 			sprintf(atcmd_output, msg_txt(1406), HCHSYS_NAME_LENGTH);// Channel length must be between 3 and %d
 			clif->message(fd, atcmd_output);
 			return false;
diff --git a/src/map/irc-bot.c b/src/map/irc-bot.c
index 8b4991c20..bd35a9867 100644
--- a/src/map/irc-bot.c
+++ b/src/map/irc-bot.c
@@ -281,7 +281,8 @@ void irc_privmsg_ctcp(int fd, char *cmd, char *source, char *target, char *msg)
  * @see irc_parse_sub
  */
 void irc_privmsg(int fd, char *cmd, char *source, char *target, char *msg) {
-	if( msg && *msg == '\001' && strlen(msg) > 2 && msg[strlen(msg)-1] == '\001' ) {
+	size_t len = msg ? strlen(msg) : 0;
+	if (msg && *msg == '\001' && len > 2 && msg[len - 1] == '\001') {
 		// CTCP
 		char command[IRC_MESSAGE_LENGTH], message[IRC_MESSAGE_LENGTH];
 		command[0] = message[0] = '\0';
diff --git a/src/map/log.c b/src/map/log.c
index 9dcf1f359..f18efbfb7 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -368,7 +368,7 @@ void log_sql_init(void) {
 		exit(EXIT_FAILURE);
 	ShowStatus(""CL_WHITE"[SQL]"CL_RESET": Successfully '"CL_GREEN"connected"CL_RESET"' to Database '"CL_WHITE"%s"CL_RESET"'.\n", logs->db_name);
 	
-	if( strlen(map->default_codepage) > 0 )
+	if (map->default_codepage[0] != '\0')
 		if ( SQL_ERROR == SQL->SetEncoding(logs->mysql_handle, map->default_codepage) )
 			Sql_ShowDebug(logs->mysql_handle);
 }
diff --git a/src/map/map.c b/src/map/map.c
index 173835d0d..2bebd3c55 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3810,7 +3810,7 @@ int map_sql_init(void)
 		exit(EXIT_FAILURE);
 	ShowStatus("connect success! (Map Server Connection)\n");
 
-	if( strlen(map->default_codepage) > 0 )
+	if (map->default_codepage[0] != '\0')
 		if ( SQL_ERROR == SQL->SetEncoding(map->mysql_handle, map->default_codepage) )
 			Sql_ShowDebug(map->mysql_handle);
 
-- 
cgit v1.2.3-60-g2f50