git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
98c3521
)
new function dict_contains
author
kramm
<kramm>
Fri, 2 Jan 2009 19:56:39 +0000
(19:56 +0000)
committer
kramm
<kramm>
Fri, 2 Jan 2009 19:56:39 +0000
(19:56 +0000)
lib/q.c
patch
|
blob
|
history
lib/q.h
patch
|
blob
|
history
diff --git
a/lib/q.c
b/lib/q.c
index
a53994a
..
8c67d06
100644
(file)
--- a/
lib/q.c
+++ b/
lib/q.c
@@
-800,10
+800,12
@@
int dict_count(dict_t*h)
return h->num;
}
return h->num;
}
-void* dict_lookup(dict_t*h, const void*key)
+void dict_do_lookup(dict_t*h, const void*key, void***match)
{
{
- if(!h->num)
- return 0;
+ if(!h->num) {
+ *match = 0;
+ return;
+ }
unsigned int ohash = h->key_type->hash(key);
unsigned int hash = ohash % h->hashsize;
unsigned int ohash = h->key_type->hash(key);
unsigned int hash = ohash % h->hashsize;
@@
-811,7
+813,8
@@
void* dict_lookup(dict_t*h, const void*key)
/* check first entry for match */
dictentry_t*e = h->slots[hash];
if(e && h->key_type->equals(e->key, key)) {
/* check first entry for match */
dictentry_t*e = h->slots[hash];
if(e && h->key_type->equals(e->key, key)) {
- return e->data;
+ *match = &e->data;
+ return;
} else if(e) {
e = e->next;
}
} else if(e) {
e = e->next;
}
@@
-832,12
+835,28
@@
void* dict_lookup(dict_t*h, const void*key)
/* check subsequent entries for a match */
while(e) {
if(h->key_type->equals(e->key, key)) {
/* check subsequent entries for a match */
while(e) {
if(h->key_type->equals(e->key, key)) {
- return e->data;
+ *match = &e->data;
+ return;
}
e = e->next;
}
}
e = e->next;
}
+ *match = 0;
+}
+void* dict_lookup(dict_t*h, const void*key)
+{
+ void**data = 0;
+ dict_do_lookup(h, key, &data);
+ if(data)
+ return *data;
return 0;
}
return 0;
}
+char dict_contains(dict_t*h, const void*key)
+{
+ void**data = 0;
+ dict_do_lookup(h, key, &data);
+ return !!data;
+}
+
char dict_del(dict_t*h, const void*key)
{
if(!h->num)
char dict_del(dict_t*h, const void*key)
{
if(!h->num)
diff --git
a/lib/q.h
b/lib/q.h
index
d1dcc57
..
173b2d6
100644
(file)
--- a/
lib/q.h
+++ b/
lib/q.h
@@
-171,6
+171,7
@@
void dict_put2(dict_t*h, const char*s, void*data);
int dict_count(dict_t*h);
void dict_dump(dict_t*h, FILE*fi, const char*prefix);
dictentry_t* dict_get_slot(dict_t*h, const void*key);
int dict_count(dict_t*h);
void dict_dump(dict_t*h, FILE*fi, const char*prefix);
dictentry_t* dict_get_slot(dict_t*h, const void*key);
+char dict_contains(dict_t*h, const void*s);
void* dict_lookup(dict_t*h, const void*s);
char dict_del(dict_t*h, const void*s);
dict_t*dict_clone(dict_t*);
void* dict_lookup(dict_t*h, const void*s);
char dict_del(dict_t*h, const void*s);
dict_t*dict_clone(dict_t*);