generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-18 03:29:49 +02:00
Code Issues Projects Releases Wiki Activity

define a macro for heap object deletion in a unified manner (related to issue #1524)

Browse Source
This commit is contained in:
reza.ebrahimi
2015-08-17 00:35:11 +04:30
parent 9bf88bcc03
commit 1621c25ef0
19 changed files with 93 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mtrie.cpp
View File

@@ -52,19 +52,17 @@ zmq::mtrie_t::mtrie_t () :
zmq::mtrie_t::~mtrie_t ()
{
if (pipes) {
delete pipes;
pipes = 0;
LIBZMQ_DELETE(pipes);
}
if (count == 1) {
zmq_assert (next.node);
delete next.node;
next.node = 0;
LIBZMQ_DELETE(next.node);
}
else
if (count > 1) {
for (unsigned short i = 0; i != count; ++i)
delete next.table [i];
else if (count > 1) {
for (unsigned short i = 0; i != count; ++i) {
LIBZMQ_DELETE(next.table[i]);
}
free (next.table);
}
}
@@ -178,8 +176,7 @@ void zmq::mtrie_t::rm_helper (pipe_t *pipe_, unsigned char **buff_,
}
if (pipes->empty ()) {
delete pipes;
pipes = 0;
LIBZMQ_DELETE(pipes);
}
}
@@ -203,8 +200,7 @@ void zmq::mtrie_t::rm_helper (pipe_t *pipe_, unsigned char **buff_,
// Prune the node if it was made redundant by the removal
if (next.node->is_redundant ()) {
delete next.node;
next.node = 0;
LIBZMQ_DELETE(next.node);
count = 0;
--live_nodes;
zmq_assert (live_nodes == 0);
@@ -226,8 +222,7 @@ void zmq::mtrie_t::rm_helper (pipe_t *pipe_, unsigned char **buff_,
// Prune redundant nodes from the mtrie
if (next.table [c]->is_redundant ()) {
delete next.table [c];
next.table [c] = 0;
LIBZMQ_DELETE(next.table[c]);
zmq_assert (live_nodes > 0);
--live_nodes;
@@ -306,8 +301,7 @@ bool zmq::mtrie_t::rm_helper (unsigned char *prefix_, size_t size_,
pipes_t::size_type erased = pipes->erase (pipe_);
zmq_assert (erased == 1);
if (pipes->empty ()) {
delete pipes;
pipes = 0;
LIBZMQ_DELETE(pipes);
}
}
return !pipes;
@@ -326,7 +320,7 @@ bool zmq::mtrie_t::rm_helper (unsigned char *prefix_, size_t size_,
bool ret = next_node->rm_helper (prefix_ + 1, size_ - 1, pipe_);
if (next_node->is_redundant ()) {
delete next_node;
LIBZMQ_DELETE(next_node);
zmq_assert (count > 0);
if (count == 1) {