diff options
Diffstat (limited to 'g10/kbnode.c')
| -rw-r--r-- | g10/kbnode.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/g10/kbnode.c b/g10/kbnode.c index 282d8b42e..79c1386aa 100644 --- a/g10/kbnode.c +++ b/g10/kbnode.c @@ -24,7 +24,7 @@ #include <string.h> #include <assert.h> #include "util.h" -#include "memory.h" +#include <gcrypt.h> #include "packet.h" #include "keydb.h" @@ -41,7 +41,7 @@ alloc_node(void) if( n ) unused_nodes = n->next; else - n = m_alloc( sizeof *n ); + n = gcry_xmalloc( sizeof *n ); n->next = NULL; n->pkt = NULL; n->flag = 0; @@ -58,7 +58,7 @@ free_node( KBNODE n ) n->next = unused_nodes; unused_nodes = n; #else - m_free( n ); + gcry_free( n ); #endif } } @@ -94,7 +94,7 @@ release_kbnode( KBNODE n ) n2 = n->next; if( !is_cloned_kbnode(n) ) { free_packet( n->pkt ); - m_free( n->pkt ); + gcry_free( n->pkt ); } free_node( n ); n = n2; @@ -266,7 +266,7 @@ commit_kbnode( KBNODE *root ) nl->next = n->next; if( !is_cloned_kbnode(n) ) { free_packet( n->pkt ); - m_free( n->pkt ); + gcry_free( n->pkt ); } free_node( n ); changed = 1; @@ -290,7 +290,7 @@ remove_kbnode( KBNODE *root, KBNODE node ) nl->next = n->next; if( !is_cloned_kbnode(n) ) { free_packet( n->pkt ); - m_free( n->pkt ); + gcry_free( n->pkt ); } free_node( n ); } |