From 0a90a9d9dbeb585826b356553719a5451c56ab3e Mon Sep 17 00:00:00 2001
From: Kevin Easton <caf@bitchx.org>
Date: Tue, 18 Oct 2016 23:46:43 +1100
Subject: [PATCH] Minor cleanups in commands2.c

Remove some unused expressions after comma operators.

parm.termid is an array so it is pointless to compare it to NULL.
---
 source/commands2.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/commands2.c b/source/commands2.c
index 6215208..b09395b 100644
--- a/source/commands2.c
+++ b/source/commands2.c
@@ -770,7 +770,7 @@ else
 		} else if (!my_strnicmp(arg, "ctcp_flood_protection", 6))
 		{
 			var = CTCP_FLOOD_PROTECTION_VAR;
-			str = "$G %cToggled %GCtcp Flood Protection %K[%W$[-3]0%K]","%s";
+			str = "$G %cToggled %GCtcp Flood Protection %K[%W$[-3]0%K]";
 		} else if (!my_strnicmp(arg, "flood_protection",7))
 		{
 			var = FLOOD_PROTECTION_VAR;
@@ -805,7 +805,7 @@ else
 		} else if (!my_strnicmp(arg, "kickflood",5))
 		{
 			var = KICKFLOOD_VAR;
-			str = "$G %cToggled %GKick Flood %K[%W$[-3]0%K]","%s";
+			str = "$G %cToggled %GKick Flood %K[%W$[-3]0%K]";
 		} else if (!my_strnicmp(arg, "msglog", 3))
 		{
 			var = MSGLOG_VAR;
@@ -833,11 +833,11 @@ else
 		} else if (!my_strnicmp(arg, "auto_rejoin", 8))
 		{
 			var = AUTO_REJOIN_VAR;
-			str = "$G %cToggled %GAuto_Rejoin %K[%W$[-3]0%K]","%s";
+			str = "$G %cToggled %GAuto_Rejoin %K[%W$[-3]0%K]";
 		} else if (!my_strnicmp(arg, "nick_completion", 6))
 		{
 			var = NICK_COMPLETION_VAR;
-			str = "$G %cToggled %GNick Completion %K[%W$[-3]0%K]","%s";
+			str = "$G %cToggled %GNick Completion %K[%W$[-3]0%K]";
 		} else if (!my_strnicmp(arg, "aop", 3))
 		{
 			var = AOP_VAR;
@@ -2472,7 +2472,7 @@ int n;
 		new_open(n);
 
 
-		term_init((parm.termid && *parm.termid) ? parm.termid : NULL);
+		term_init(*parm.termid ? parm.termid : NULL);
 		reset_cols(parm.cols);
 		reset_lines(parm.rows);
 		reinit_term(main_screen->fdin);