X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=common%2Ftrie.c;h=7f0ff2d2f2f9bf8bcfbb0e679527f8bf0c96b437;hb=1488a5e58f31f263a38e1ad983a58b3d657b089e;hp=5bf18ecd848a82d313c19f15694b3e100b9cfdf5;hpb=150de5c8a15de6797f2844293891621efefff40b;p=apps%2Fpfixtools.git diff --git a/common/trie.c b/common/trie.c index 5bf18ec..7f0ff2d 100644 --- a/common/trie.c +++ b/common/trie.c @@ -33,8 +33,6 @@ * Copyright © 2008 Florent Bruneau */ -#include - #include "array.h" #include "str.h" #include "trie.h" @@ -304,13 +302,13 @@ void trie_lock(trie_t *trie) if (trie->locked) { return; } - if (mlock(trie->entries.data, sizeof(trie_entry_t) * trie->entries.len) != 0) { + if (!array_lock(trie->entries)) { UNIXERR("mlock"); return; } - if (mlock(trie->c.data, trie->c.len) != 0) { + if (!array_lock(trie->c)) { UNIXERR("mlock"); - munlock(trie->entries.data, sizeof(trie_entry_t) * trie->entries.len); + array_unlock(trie->entries); return; } trie->locked = true; @@ -321,8 +319,8 @@ void trie_unlock(trie_t *trie) if (!trie->locked) { return; } - munlock(trie->entries.data, sizeof(trie_entry_t) * trie->entries.len); - munlock(trie->c.data, trie->c.len); + array_unlock(trie->entries); + array_unlock(trie->entries); trie->locked = false; }