Mem::dup() and mdup() should return void* instead of char*

This commit is contained in:
Ivan Skytte Jørgensen
2017-02-19 16:38:06 +01:00
parent eea835c9b2
commit d1da8bd20a
3 changed files with 4 additions and 4 deletions

@ -1032,7 +1032,7 @@ void *Mem::gbrealloc ( void *ptr , size_t oldSize , size_t newSize , const char
return mem;
}
char *Mem::dup ( const void *data , size_t dataSize , const char *note ) {
void *Mem::dup ( const void *data , size_t dataSize , const char *note ) {
logTrace( g_conf.m_logTraceMem, "data=%p dataSize=%zu note='%s'", data, dataSize, note );
// keep it simple

4
Mem.h

@ -30,7 +30,7 @@ class Mem {
void *gbcalloc ( size_t size , const char *note);
void *gbrealloc ( void *oldPtr, size_t oldSize, size_t newSize, const char *note);
void gbfree(void *ptr, const char *note, size_t size, bool checksize);
char *dup ( const void *data , size_t dataSize , const char *note);
void *dup ( const void *data , size_t dataSize , const char *note);
// this one does not include new/delete mem, only *alloc()/free() mem
size_t getUsedMem() const;
@ -107,7 +107,7 @@ static inline void mfree(void *ptr, size_t size, const char *note) {
return g_mem.gbfree(ptr, note, size, true);
}
static inline char *mdup(const void *data, size_t dataSize, const char *note) {
static inline void *mdup(const void *data, size_t dataSize, const char *note) {
return g_mem.dup(data, dataSize, note);
}

@ -512,7 +512,7 @@ bool RdbCache::getRecord ( collnum_t collnum ,
*rec = p;
// copy the data and set "list" with it iff "doCopy" is true
if ( doCopy && *recSize > 0 ) {
*rec = mdup ( p , *recSize , "RdbCache3" );
*rec = (char*)mdup ( p , *recSize , "RdbCache3" );
if ( ! *rec ) {
log(LOG_WARN, "db: Could not allocate space for cached record for %s of %" PRId32" bytes.",
m_dbname,*recSize);