Fix a typo in configure (glad it was only a minor typo in the help text)

[irc/rqf/shadowircd.git] / src / irc_dictionary.c

diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 49bb8ad74e5ea88dab214924046bc0995555b6ee..89a0a7bb770b0df9b0d93575827774f4b87ff9dd 100644 (file)
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -23,8 +23,7 @@
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
-#include "irc_string.h"
+#include "match.h"
 #include "client.h"
 #include "setup.h"
 #include "irc_dictionary.h"
@@ -62,7 +61,7 @@ struct Dictionary *irc_dictionary_create(DCF compare_cb)
        dtree->compare_cb = compare_cb;
 
        if (!elem_heap)
-               elem_heap = rb_bh_create(sizeof(struct DictionaryElement), 1024);
+               elem_heap = rb_bh_create(sizeof(struct DictionaryElement), 1024, "dictionary_elem_heap");
 
        return dtree;
 }
@@ -93,7 +92,7 @@ struct Dictionary *irc_dictionary_create_named(const char *name,
        dtree->id = rb_strdup(name);
 
        if (!elem_heap)
-               elem_heap = rb_bh_create(sizeof(struct DictionaryElement), 1024);
+               elem_heap = rb_bh_create(sizeof(struct DictionaryElement), 1024, "dictionary_elem_heap");
 
        return dtree;
 }
@@ -204,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;
@@ -303,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)
 {
@@ -383,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;
@@ -645,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;
        }
 
@@ -704,7 +703,7 @@ struct DictionaryElement *irc_dictionary_find(struct Dictionary *dict, const cha
  * Side Effects:
  *     - data is inserted into the DTree.
  */
-struct DictionaryElement *irc_dictionary_add(struct Dictionary *dict, char *key, void *data)
+struct DictionaryElement *irc_dictionary_add(struct Dictionary *dict, const char *key, void *data)
 {
        struct DictionaryElement *delem;
 
@@ -851,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;
 }