admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bugs with OA dict.

Browse Source
This commit is contained in:
Patrick Pelissier committed 2017-06-08 23:36:12 +02:00
1 parent 305c7ed2c1
commit 4b50020f12
1 file changed
+9 -2
Download Patch File Download Diff File Expand all files Collapse all files
m-dict.h
+9 -2
View File
@@ -624,6 +624,13 @@ typedef enum {
M_C3(dict_,name,_clear)(dict_t dict) \
{ \
DICTI_OA_CONTRACT(dict); \
for(size_t i = 0; i <= dict->mask; i++) { \
if (!oor_equal_p(dict->data[i].key, DICTI_OA_EMPTY) \
&& !oor_equal_p(dict->data[i].key, DICTI_OA_DELETED)) { \
M_GET_CLEAR key_oplist (dict->data[i].key); \
M_GET_CLEAR value_oplist (dict->data[i].value); \
} \
} \
M_GET_FREE key_oplist (dict->data); \
/* Not really needed, but safer */ \
dict->mask = 0; \
@@ -931,7 +938,7 @@ typedef enum {
oor_set(org->data[i].key, DICTI_OA_DELETED); \
} else { \
M_GET_INIT_SET key_oplist (map->data[i].key, org->data[i].key); \
M_GET_INIT_SET value_oplist (map->data[i].key, org->data[i].key); \
M_GET_INIT_SET value_oplist (map->data[i].value, org->data[i].value); \
} \
} \
DICTI_OA_CONTRACT(map); \
@@ -1001,7 +1008,7 @@ typedef enum {
if (!oor_equal_p(d->data[i].key, DICTI_OA_EMPTY) \
&& !oor_equal_p(d->data[i].key, DICTI_OA_DELETED)) { \
M_GET_CLEAR key_oplist (d->data[i].key); \
M_GET_CLEAR value_oplist (d->data[i].key); \
M_GET_CLEAR value_oplist (d->data[i].value); \
oor_set(d->data[i].key, DICTI_OA_EMPTY); \
} \
} \