vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

capability: store capability bit entries with actual bit numbers, instead of as an expanded mask

Browse source 
This makes accounting of number of bits allocated easier.  Specifically, the amount of allocated
bits is computed by doing (index->highest_bit - 1) in code.
This commit is contained in:
William Pitcock 2012-02-04 05:23:15 -06:00
parent e915e51f4d
commit 8bedf01d19
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/capability.c
View file

@ -45,7 +45,7 @@ capability_get(struct CapabilityIndex *index, const char *cap)
entry = irc_dictionary_retrieve(index->cap_dict, cap); entry = irc_dictionary_retrieve(index->cap_dict, cap);
if (entry != NULL && !(entry->flags & CAP_ORPHANED)) if (entry != NULL && !(entry->flags & CAP_ORPHANED))
return entry->value; return (1 << entry->value);
return 0xFFFFFFFF; return 0xFFFFFFFF;
} }
@ -56,11 +56,13 @@ capability_put(struct CapabilityIndex *index, const char *cap)
struct CapabilityEntry *entry; struct CapabilityEntry *entry;
s_assert(index != NULL); s_assert(index != NULL);
if (!index->highest_bit)
return 0xFFFFFFFF;
if ((entry = irc_dictionary_retrieve(index->cap_dict, cap)) != NULL) if ((entry = irc_dictionary_retrieve(index->cap_dict, cap)) != NULL)
{ {
entry->flags &= ~CAP_ORPHANED; entry->flags &= ~CAP_ORPHANED;
return entry->value; return (1 << entry->value);
} }
entry = rb_malloc(sizeof(struct CapabilityEntry)); entry = rb_malloc(sizeof(struct CapabilityEntry));
@ -70,13 +72,11 @@ capability_put(struct CapabilityIndex *index, const char *cap)
irc_dictionary_add(index->cap_dict, entry->cap, entry); irc_dictionary_add(index->cap_dict, entry->cap, entry);
index->highest_bit <<= 1; index->highest_bit++;
if (index->highest_bit % (sizeof(unsigned int) * 8) == 0)
index->highest_bit = 0;
/* hmm... not sure what to do here, so i guess we will abort for now... --nenolod */ return (1 << entry->value);
if (index->highest_bit == 0)
abort();
return entry->value;
} }
void void
@ -175,7 +175,7 @@ capability_index_mask(struct CapabilityIndex *index)
DICTIONARY_FOREACH(entry, &iter, index->cap_dict) DICTIONARY_FOREACH(entry, &iter, index->cap_dict)
{ {
if (!(entry->flags & CAP_ORPHANED)) if (!(entry->flags & CAP_ORPHANED))
mask |= entry->value; mask |= (1 << entry->value);
} }
return mask; return mask;
@ -193,7 +193,7 @@ capability_index_get_required(struct CapabilityIndex *index)
DICTIONARY_FOREACH(entry, &iter, index->cap_dict) DICTIONARY_FOREACH(entry, &iter, index->cap_dict)
{ {
if (!(entry->flags & CAP_ORPHANED) && (entry->flags & CAP_REQUIRED)) if (!(entry->flags & CAP_ORPHANED) && (entry->flags & CAP_REQUIRED))
mask |= entry->value; mask |= (1 << entry->value);
} }
return mask; return mask;