X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/32df5e96a650dff98f06bf29b39fa945040981d7..9e5c31ea0d2f21e1eb4f761606f1b5dbaa34c2bb:/ircd/capability.c

diff --git a/ircd/capability.c b/ircd/capability.c
index b161ece8..618c127a 100644
--- a/ircd/capability.c
+++ b/ircd/capability.c
@@ -20,7 +20,7 @@
 
 #include "stdinc.h"
 #include "capability.h"
-#include "irc_dictionary.h"
+#include "rb_dictionary.h"
 #include "s_assert.h"
 
 static rb_dlink_list capability_indexes = { NULL, NULL, 0 };
@@ -32,7 +32,7 @@ capability_find(struct CapabilityIndex *idx, const char *cap)
 	if (cap == NULL)
 		return NULL;
 
-	return irc_dictionary_retrieve(idx->cap_dict, cap);
+	return rb_dictionary_retrieve(idx->cap_dict, cap);
 }
 
 unsigned int
@@ -44,7 +44,7 @@ capability_get(struct CapabilityIndex *idx, const char *cap, void **ownerdata)
 	if (cap == NULL)
 		return 0;
 
-	entry = irc_dictionary_retrieve(idx->cap_dict, cap);
+	entry = rb_dictionary_retrieve(idx->cap_dict, cap);
 	if (entry != NULL && !(entry->flags & CAP_ORPHANED))
 	{
 		if (ownerdata != NULL)
@@ -64,7 +64,7 @@ capability_put(struct CapabilityIndex *idx, const char *cap, void *ownerdata)
 	if (!idx->highest_bit)
 		return 0xFFFFFFFF;
 
-	if ((entry = irc_dictionary_retrieve(idx->cap_dict, cap)) != NULL)
+	if ((entry = rb_dictionary_retrieve(idx->cap_dict, cap)) != NULL)
 	{
 		entry->flags &= ~CAP_ORPHANED;
 		return (1 << entry->value);
@@ -76,7 +76,7 @@ capability_put(struct CapabilityIndex *idx, const char *cap, void *ownerdata)
 	entry->value = idx->highest_bit;
 	entry->ownerdata = ownerdata;
 
-	irc_dictionary_add(idx->cap_dict, entry->cap, entry);
+	rb_dictionary_add(idx->cap_dict, entry->cap, entry);
 
 	idx->highest_bit++;
 	if (idx->highest_bit % (sizeof(unsigned int) * 8) == 0)
@@ -107,11 +107,12 @@ capability_orphan(struct CapabilityIndex *idx, const char *cap)
 
 	s_assert(idx != NULL);
 
-	entry = irc_dictionary_retrieve(idx->cap_dict, cap);
+	entry = rb_dictionary_retrieve(idx->cap_dict, cap);
 	if (entry != NULL)
 	{
 		entry->flags &= ~CAP_REQUIRED;
 		entry->flags |= CAP_ORPHANED;
+		entry->ownerdata = NULL;
 	}
 }
 
@@ -122,13 +123,13 @@ capability_require(struct CapabilityIndex *idx, const char *cap)
 
 	s_assert(idx != NULL);
 
-	entry = irc_dictionary_retrieve(idx->cap_dict, cap);
+	entry = rb_dictionary_retrieve(idx->cap_dict, cap);
 	if (entry != NULL)
 		entry->flags |= CAP_REQUIRED;
 }
 
 static void
-capability_destroy(struct DictionaryElement *delem, void *privdata)
+capability_destroy(rb_dictionary_element *delem, void *privdata)
 {
 	s_assert(delem != NULL);
 
@@ -142,7 +143,7 @@ capability_index_create(const char *name)
 
 	idx = rb_malloc(sizeof(struct CapabilityIndex));
 	idx->name = name;
-	idx->cap_dict = irc_dictionary_create(name, strcasecmp);
+	idx->cap_dict = rb_dictionary_create(name, rb_strcasecmp);
 	idx->highest_bit = 1;
 
 	rb_dlinkAdd(idx, &idx->node, &capability_indexes);
@@ -157,14 +158,14 @@ capability_index_destroy(struct CapabilityIndex *idx)
 
 	rb_dlinkDelete(&idx->node, &capability_indexes);
 
-	irc_dictionary_destroy(idx->cap_dict, capability_destroy, NULL);
+	rb_dictionary_destroy(idx->cap_dict, capability_destroy, NULL);
 	rb_free(idx);
 }
 
 const char *
 capability_index_list(struct CapabilityIndex *idx, unsigned int cap_mask)
 {
-	struct DictionaryIter iter;
+	rb_dictionary_iter iter;
 	struct CapabilityEntry *entry;
 	static char buf[BUFSIZE];
 	char *t = buf;
@@ -174,7 +175,7 @@ capability_index_list(struct CapabilityIndex *idx, unsigned int cap_mask)
 
 	*t = '\0';
 
-	DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
+	RB_DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
 	{
 		if ((1 << entry->value) & cap_mask)
 		{
@@ -192,13 +193,13 @@ capability_index_list(struct CapabilityIndex *idx, unsigned int cap_mask)
 unsigned int
 capability_index_mask(struct CapabilityIndex *idx)
 {
-	struct DictionaryIter iter;
+	rb_dictionary_iter iter;
 	struct CapabilityEntry *entry;
 	unsigned int mask = 0;
 
 	s_assert(idx != NULL);
 
-	DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
+	RB_DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
 	{
 		if (!(entry->flags & CAP_ORPHANED))
 			mask |= (1 << entry->value);
@@ -210,13 +211,13 @@ capability_index_mask(struct CapabilityIndex *idx)
 unsigned int
 capability_index_get_required(struct CapabilityIndex *idx)
 {
-	struct DictionaryIter iter;
+	rb_dictionary_iter iter;
 	struct CapabilityEntry *entry;
 	unsigned int mask = 0;
 
 	s_assert(idx != NULL);
 
-	DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
+	RB_DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
 	{
 		if (!(entry->flags & CAP_ORPHANED) && (entry->flags & CAP_REQUIRED))
 			mask |= (1 << entry->value);
@@ -234,13 +235,13 @@ capability_index_stats(void (*cb)(const char *line, void *privdata), void *privd
 	RB_DLINK_FOREACH(node, capability_indexes.head)
 	{
 		struct CapabilityIndex *idx = node->data;
-		struct DictionaryIter iter;
+		rb_dictionary_iter iter;
 		struct CapabilityEntry *entry;
 
 		snprintf(buf, sizeof buf, "'%s': allocated bits - %d", idx->name, (idx->highest_bit - 1));
 		cb(buf, privdata);
 
-		DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
+		RB_DICTIONARY_FOREACH(entry, &iter, idx->cap_dict)
 		{
 			snprintf(buf, sizeof buf, "bit %d: '%s'", entry->value, entry->cap);
 			cb(buf, privdata);