From b978b76bb712be79b84163ff5dce5dc9c7ba3e2c Mon Sep 17 00:00:00 2001
From: Tim Cava <tcava@users.sourceforge.net>
Date: Wed, 23 Oct 2013 17:44:20 +0000
Subject: [PATCH] Cleanup s_watch().

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@408 13b04d17-f746-0410-82c6-800466cd88b0
---
 source/notice.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/notice.c b/source/notice.c
index 09c6623..41dcc66 100644
--- a/source/notice.c
+++ b/source/notice.c
@@ -1109,36 +1109,37 @@ unsigned long old = get_server_ircop_flags(server);
 
 BUILT_IN_COMMAND(s_watch)
 {
-unsigned long flag = 0;
-unsigned long old_flags;
-int gotargs = 0;
+	int gotargs = 0;
+	unsigned long old_flags, flag;
 
 	if (from_server == -1)
 	{
 		put_it("%s", convert_output_format("$G Try connecting to a server first", NULL, NULL));
 		return;
 	}
+
 	if (args && *args)
 		gotargs = 1;
+
 	old_flags = get_server_ircop_flags(from_server);	
 	flag = ircop_str_to_flags(old_flags, args);
 	if (flag != old_flags)
 		set_server_ircop_flags(from_server, flag);
 	else if (gotargs && old_flags != -1)
 	{
-		char buffer[BIG_BUFFER_SIZE+1];
 		int i;
+		char buffer[BIG_BUFFER_SIZE];
+
 		strcpy(buffer, all);
 		for (i = 0; opflags[i]; i++)
 		{
-			strmcat(buffer, space, BIG_BUFFER_SIZE);
-			strmcat(buffer, opflags[i], BIG_BUFFER_SIZE);
+			strlcat(buffer, space, sizeof buffer);
+			strlcat(buffer, opflags[i], sizeof buffer);
 		}
-		strmcat(buffer, space, BIG_BUFFER_SIZE);
-		strmcat(buffer, none, BIG_BUFFER_SIZE);
+		strlcat(buffer, space, BIG_BUFFER_SIZE);
+		strlcat(buffer, none, BIG_BUFFER_SIZE);
 		bitchsay("You must specify from the following:");
 		put_it("\t%s", buffer);
-		/*ALL COLLIDE KILLS MISMATCH HACK IDENTD FAKES UNAUTHS CLIENTS TRAFFIC CRAP REHASH KLINE BOTS OPER SQUIT SERVER CONNECT FLOOD USER STATS NICK ACTIVEK NONE");*/
 		return;
 	}
 	print_ircop_flags(from_server);