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

Minor code beautification for mtrie_t

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik
2011-06-01 11:54:33 +02:00
parent ee7313b4d8
commit 3935258b82
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/mtrie.cpp
View File

@@ -51,6 +51,12 @@ zmq::mtrie_t::~mtrie_t ()
}
bool zmq::mtrie_t::add (unsigned char *prefix_, size_t size_, pipe_t *pipe_)
{
return add_helper (prefix_, size_, pipe_);
}
bool zmq::mtrie_t::add_helper (unsigned char *prefix_, size_t size_,
pipe_t *pipe_)
{
// We are at the node corresponding to the prefix. We are done.
if (!size_) {
@@ -114,14 +120,14 @@ bool zmq::mtrie_t::add (unsigned char *prefix_, size_t size_, pipe_t *pipe_)
next.node = new (std::nothrow) mtrie_t;
zmq_assert (next.node);
}
return next.node->add (prefix_ + 1, size_ - 1, pipe_);
return next.node->add_helper (prefix_ + 1, size_ - 1, pipe_);
}
else {
if (!next.table [c - min]) {
next.table [c - min] = new (std::nothrow) mtrie_t;
zmq_assert (next.table [c - min]);
}
return next.table [c - min]->add (prefix_ + 1, size_ - 1, pipe_);
return next.table [c - min]->add_helper (prefix_ + 1, size_ - 1, pipe_);
}
}
@@ -175,23 +181,29 @@ void zmq::mtrie_t::rm_helper (pipe_t *pipe_, unsigned char **buff_,
bool zmq::mtrie_t::rm (unsigned char *prefix_, size_t size_, pipe_t *pipe_)
{
if (!size_) {
pipes_t::size_type erased = pipes.erase (pipe_);
zmq_assert (erased == 1);
return pipes.empty ();
}
return rm_helper (prefix_, size_, pipe_);
}
unsigned char c = *prefix_;
if (!count || c < min || c >= min + count)
return false;
bool zmq::mtrie_t::rm_helper (unsigned char *prefix_, size_t size_,
pipe_t *pipe_)
{
if (!size_) {
pipes_t::size_type erased = pipes.erase (pipe_);
zmq_assert (erased == 1);
return pipes.empty ();
}
mtrie_t *next_node =
count == 1 ? next.node : next.table [c - min];
unsigned char c = *prefix_;
if (!count || c < min || c >= min + count)
return false;
if (!next_node)
return false;
mtrie_t *next_node =
count == 1 ? next.node : next.table [c - min];
return next_node->rm (prefix_ + 1, size_ - 1, pipe_);
if (!next_node)
return false;
return next_node->rm_helper (prefix_ + 1, size_ - 1, pipe_);
}
void zmq::mtrie_t::match (unsigned char *data_, size_t size_, pipes_t &pipes_)