mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
memcpy -> memmove
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85f5e1110d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-03-09 (Wed, 09 Mar 2011)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -288,7 +288,7 @@ int XML_Parser::Parse(const char *s, int len, int isFinal)
|
||||
bufferLim=buffer+len*2;
|
||||
};
|
||||
|
||||
memcpy(buffer, end, nLeftOver);
|
||||
memmove(buffer, end, nLeftOver);
|
||||
|
||||
bufferPtr=buffer;
|
||||
bufferEnd=buffer+nLeftOver;
|
||||
@@ -298,7 +298,7 @@ int XML_Parser::Parse(const char *s, int len, int isFinal)
|
||||
}
|
||||
else
|
||||
{
|
||||
memcpy(GetBuffer(len), s, len);
|
||||
memmove(GetBuffer(len), s, len);
|
||||
return ParseBuffer(len, isFinal);
|
||||
};
|
||||
}
|
||||
@@ -365,7 +365,7 @@ void *XML_Parser::GetBuffer(int len)
|
||||
|
||||
if (bufferPtr)
|
||||
{
|
||||
memcpy(newBuf, bufferPtr, bufferEnd-bufferPtr);
|
||||
memmove(newBuf, bufferPtr, bufferEnd-bufferPtr);
|
||||
free(buffer);
|
||||
};
|
||||
|
||||
@@ -783,7 +783,7 @@ enum XML_Error XML_Parser::doContent(int startTagLevel, const ENCODING *enc, con
|
||||
tag->bufEnd=tag->buf+bufSize;
|
||||
};
|
||||
|
||||
memcpy(tag->buf, tag->rawName, tag->rawNameLength);
|
||||
memmove(tag->buf, tag->rawName, tag->rawNameLength);
|
||||
tag->rawName=tag->buf;
|
||||
};
|
||||
|
||||
@@ -2686,7 +2686,7 @@ static int poolGrow(STRING_POOL *pool)
|
||||
pool->blocks=pool->freeBlocks;
|
||||
pool->freeBlocks=tem;
|
||||
|
||||
memcpy(pool->blocks->s, pool->start, (pool->end-pool->start)*sizeof(XML_Char));
|
||||
memmove(pool->blocks->s, pool->start, (pool->end-pool->start)*sizeof(XML_Char));
|
||||
|
||||
pool->ptr=pool->blocks->s+(pool->ptr-pool->start);
|
||||
pool->start=pool->blocks->s;
|
||||
@@ -2728,7 +2728,7 @@ static int poolGrow(STRING_POOL *pool)
|
||||
|
||||
pool->blocks=tem;
|
||||
|
||||
memcpy(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char));
|
||||
memmove(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char));
|
||||
|
||||
pool->ptr=tem->s+(pool->ptr-pool->start);
|
||||
pool->start=tem->s;
|
||||
|
@@ -325,7 +325,7 @@ void XMLTreeNode::SetData(char *dat, unsigned int datSize)
|
||||
data=new char[dataSize+1];
|
||||
data[dataSize]=0;
|
||||
|
||||
memcpy(data, dat, datSize);
|
||||
memmove(data, dat, datSize);
|
||||
}
|
||||
|
||||
void XMLTreeNode::AppendData(char *dat, unsigned int datSize)
|
||||
@@ -337,8 +337,8 @@ void XMLTreeNode::AppendData(char *dat, unsigned int datSize)
|
||||
char *tmp;
|
||||
|
||||
tmp=new char[dataSize+datSize];
|
||||
memcpy(tmp, data, dataSize);
|
||||
memcpy(tmp+dataSize, dat, datSize);
|
||||
memmove(tmp, data, dataSize);
|
||||
memmove(tmp+dataSize, dat, datSize);
|
||||
|
||||
SetData(tmp, dataSize+datSize);
|
||||
|
||||
|
Reference in New Issue
Block a user