From e8f1c19e7b8fb83623e5f36aa55b5cbd3acc5eea Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Sat, 5 Mar 2016 00:55:33 -0600
Subject: [PATCH 1/2] parse: get rid of report_messages

It is a function with a single usage, that is used only for one specific
stats command on one line.
---
 include/parse.h   |  1 -
 ircd/parse.c      | 32 --------------------------------
 modules/m_stats.c | 22 ++++++++++++++++++++--
 3 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/include/parse.h b/include/parse.h
index 266a065b..8dce28a7 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -39,7 +39,6 @@ extern void handle_encap(struct MsgBuf *, struct Client *, struct Client *,
 extern void clear_hash_parse(void);
 extern void mod_add_cmd(struct Message *msg);
 extern void mod_del_cmd(struct Message *msg);
-extern void report_messages(struct Client *);
 extern char *reconstruct_parv(int parc, const char *parv[]);
 
 extern struct Dictionary *alias_dict;
diff --git a/ircd/parse.c b/ircd/parse.c
index 6ec8ba42..ca1ed7eb 100644
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -338,38 +338,6 @@ mod_del_cmd(struct Message *msg)
 	irc_dictionary_delete(cmd_dict, msg->cmd);
 }
 
-/*
- * report_messages
- *
- * inputs	- pointer to client to report to
- * output	- NONE
- * side effects	- NONE
- */
-void
-report_messages(struct Client *source_p)
-{
-	struct DictionaryIter iter;
-	struct Message *msg;
-	struct alias_entry *amsg;
-
-	DICTIONARY_FOREACH(msg, &iter, cmd_dict)
-	{
-		s_assert(msg->cmd != NULL);
-		sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
-				   form_str(RPL_STATSCOMMANDS),
-				   msg->cmd, msg->count,
-				   msg->bytes, msg->rcount);
-	}
-
-	DICTIONARY_FOREACH(amsg, &iter, alias_dict)
-	{
-		s_assert(amsg->name != NULL);
-		sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
-				   form_str(RPL_STATSCOMMANDS),
-				   amsg->name, amsg->hits, 0L, 0);
-	}
-}
-
 /* cancel_clients()
  *
  * inputs	- client who sent us the message, client with fake
diff --git a/modules/m_stats.c b/modules/m_stats.c
index a41926be..77e41873 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -722,7 +722,26 @@ stats_klines(struct Client *source_p)
 static void
 stats_messages(struct Client *source_p)
 {
-	report_messages(source_p);
+	struct DictionaryIter iter;
+	struct Message *msg;
+	struct alias_entry *amsg;
+
+	DICTIONARY_FOREACH(msg, &iter, cmd_dict)
+	{
+		s_assert(msg->cmd != NULL);
+		sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
+				   form_str(RPL_STATSCOMMANDS),
+				   msg->cmd, msg->count,
+				   msg->bytes, msg->rcount);
+	}
+
+	DICTIONARY_FOREACH(amsg, &iter, alias_dict)
+	{
+		s_assert(amsg->name != NULL);
+		sendto_one_numeric(source_p, RPL_STATSCOMMANDS,
+				   form_str(RPL_STATSCOMMANDS),
+				   amsg->name, amsg->hits, 0L, 0);
+	}
 }
 
 static void
@@ -1771,4 +1790,3 @@ stats_p_spy (struct Client *source_p)
 
 	call_hook(doing_stats_p_hook, &data);
 }
-

From 7416e480b0c667396c9a0bcc9ef7e48e627f479f Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Sat, 5 Mar 2016 01:04:54 -0600
Subject: [PATCH 2/2] parse: export cmd_dict for use elsewhere.

---
 include/parse.h | 1 +
 ircd/parse.c    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/parse.h b/include/parse.h
index 8dce28a7..b50e9bcf 100644
--- a/include/parse.h
+++ b/include/parse.h
@@ -42,5 +42,6 @@ extern void mod_del_cmd(struct Message *msg);
 extern char *reconstruct_parv(int parc, const char *parv[]);
 
 extern struct Dictionary *alias_dict;
+extern struct Dictionary *cmd_dict;
 
 #endif /* INCLUDED_parse_h_h */
diff --git a/ircd/parse.c b/ircd/parse.c
index ca1ed7eb..6691edb0 100644
--- a/ircd/parse.c
+++ b/ircd/parse.c
@@ -44,7 +44,7 @@
 #include "packet.h"
 #include "s_assert.h"
 
-static struct Dictionary *cmd_dict = NULL;
+struct Dictionary *cmd_dict = NULL;
 struct Dictionary *alias_dict = NULL;
 
 /* parv[0] is not used, and parv[LAST] == NULL */