Remove duplicate and unused code (compare src/lib/util/cstrpool.c) (nw)

This commit is contained in:
Justin Kerk 2015-01-31 12:40:43 -08:00
parent 1e60dfa08d
commit 519be73d61

View File

@ -264,98 +264,6 @@ bool software_info::has_multiple_parts(const char *interface) const
//**************************************************************************
// CONST STRING POOL
//**************************************************************************
//-------------------------------------------------
// const_string_pool - constructor
//-------------------------------------------------
const_string_pool::const_string_pool()
{
}
//-------------------------------------------------
// add - add a string to the string pool
//-------------------------------------------------
const char *const_string_pool::add(const char *string)
{
// if NULL or a small number (for some hash strings), just return as-is
if (FPTR(string) < 0x100)
return string;
// scan to find space
for (pool_chunk *chunk = m_chunklist.first(); chunk != NULL; chunk = chunk->next())
{
const char *result = chunk->add(string);
if (result != NULL)
return result;
}
// no space anywhere, create a new pool and prepend it (so it gets used first)
const char *result = m_chunklist.prepend(*global_alloc(pool_chunk)).add(string);
assert(result != NULL);
return result;
}
//-------------------------------------------------
// contains - determine if the given string
// pointer lives in the pool
//-------------------------------------------------
bool const_string_pool::contains(const char *string)
{
// if NULL or a small number (for some hash strings), then yes, effectively
if (FPTR(string) < 0x100)
return true;
// scan to find it
for (pool_chunk *chunk = m_chunklist.first(); chunk != NULL; chunk = chunk->next())
if (chunk->contains(string))
return true;
return false;
}
//-------------------------------------------------
// pool_chunk - constructor
//-------------------------------------------------
const_string_pool::pool_chunk::pool_chunk()
: m_next(NULL),
m_used(0)
{
}
//-------------------------------------------------
// add - add a string to this pool
//-------------------------------------------------
const char *const_string_pool::pool_chunk::add(const char *string)
{
// get the length of the string (no string can be longer than a full pool)
int bytes = strlen(string) + 1;
assert(bytes < POOL_SIZE);
// if too big, return NULL
if (m_used + bytes > POOL_SIZE)
return NULL;
// allocate, copy, and return the memory
char *dest = &m_buffer[m_used];
m_used += bytes;
memcpy(dest, string, bytes);
return dest;
}
//**************************************************************************
// SOFTWARE LIST DEVICE
//**************************************************************************