X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d99380b61b3fa166d2105bc017508392dbb38939..6fbcf3827c79181763ddb93b767b1bfd30724cf7:/src/irc_dictionary.c

diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 0a827db..89a0a7b 100644
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -23,7 +23,7 @@
  */
 
 #include "stdinc.h"
-#include "irc_string.h"
+#include "match.h"
 #include "client.h"
 #include "setup.h"
 #include "irc_dictionary.h"
@@ -203,7 +203,7 @@ irc_dictionary_get_linear_index(struct Dictionary *dict, const char *key)
  * Side Effects:
  *     - a new root node is nominated.
  */
-void
+static void
 irc_dictionary_retune(struct Dictionary *dict, const char *key)
 {
 	struct DictionaryElement n, *tn, *left, *right, *node;
@@ -302,7 +302,7 @@ irc_dictionary_retune(struct Dictionary *dict, const char *key)
  * Side Effects:
  *     - a node is linked to the dictionary tree
  */
-void
+static void
 irc_dictionary_link(struct Dictionary *dict,
 	struct DictionaryElement *delem)
 {
@@ -382,7 +382,7 @@ irc_dictionary_link(struct Dictionary *dict,
  * Side Effects:
  *     - the root node is unlinked from the dictionary tree
  */
-void
+static void
 irc_dictionary_unlink_root(struct Dictionary *dict)
 {
 	struct DictionaryElement *delem, *nextnode, *parentofnext;
@@ -644,7 +644,7 @@ void irc_dictionary_foreach_next(struct Dictionary *dtree,
 
 	if (state->cur == NULL)
 	{
-		ilog(L_MAIN, "irc_dictionary_foreach_next(): called again after iteration finished on dtree<%p>", dtree);
+		ilog(L_MAIN, "irc_dictionary_foreach_next(): called again after iteration finished on dtree<%p>", (void *)dtree);
 		return;
 	}
 
@@ -850,15 +850,15 @@ void irc_dictionary_stats(struct Dictionary *dict, void (*cb)(const char *line,
 	s_assert(dict != NULL);
 
 	if (dict->id != NULL)
-		snprintf(str, sizeof str, "Dictionary stats for %s (%d)",
+		rb_snprintf(str, sizeof str, "Dictionary stats for %s (%d)",
 				dict->id, dict->count);
 	else
-		snprintf(str, sizeof str, "Dictionary stats for <%p> (%d)",
-				dict, dict->count);
+		rb_snprintf(str, sizeof str, "Dictionary stats for <%p> (%d)",
+				(void *)dict, dict->count);
 	cb(str, privdata);
 	maxdepth = 0;
 	sum = stats_recurse(dict->root, 0, &maxdepth);
-	snprintf(str, sizeof str, "Depth sum %d Avg depth %d Max depth %d", sum, sum / dict->count, maxdepth);
+	rb_snprintf(str, sizeof str, "Depth sum %d Avg depth %d Max depth %d", sum, sum / dict->count, maxdepth);
 	cb(str, privdata);
 	return;
 }