From cdfdf592bd7f6cac3828fe308af900b895a4fc0a Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Fri, 19 Feb 2010 23:55:17 +0000 Subject: [PATCH] cmd.c (Cbuf_Execute), net_dgrm.c (Datagram_GetMessage), net_loop.c (Loop_GetMessage): replaced memcpy calls for overlapping areas with memmove(). git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@66 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/cmd.c | 2 +- Quake/net_dgrm.c | 2 +- Quake/net_loop.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Quake/cmd.c b/Quake/cmd.c index 595db56b..b133a475 100644 --- a/Quake/cmd.c +++ b/Quake/cmd.c @@ -181,7 +181,7 @@ void Cbuf_Execute (void) { i++; cmd_text.cursize -= i; - Q_memcpy (text, text+i, cmd_text.cursize); + memmove (text, text + i, cmd_text.cursize); } // execute the command line diff --git a/Quake/net_dgrm.c b/Quake/net_dgrm.c index 0fc2ca45..6544dad4 100644 --- a/Quake/net_dgrm.c +++ b/Quake/net_dgrm.c @@ -413,7 +413,7 @@ int Datagram_GetMessage (qsocket_t *sock) sock->sendMessageLength -= MAX_DATAGRAM; if (sock->sendMessageLength > 0) { - Q_memcpy(sock->sendMessage, sock->sendMessage+MAX_DATAGRAM, sock->sendMessageLength); + memmove(sock->sendMessage, sock->sendMessage + MAX_DATAGRAM, sock->sendMessageLength); sock->sendNext = true; } else diff --git a/Quake/net_loop.c b/Quake/net_loop.c index a9b3a844..71f93662 100644 --- a/Quake/net_loop.c +++ b/Quake/net_loop.c @@ -143,7 +143,7 @@ int Loop_GetMessage (qsocket_t *sock) sock->receiveMessageLength -= length; if (sock->receiveMessageLength) - Q_memcpy(sock->receiveMessage, &sock->receiveMessage[length], sock->receiveMessageLength); + memmove(sock->receiveMessage, &sock->receiveMessage[length], sock->receiveMessageLength); if (sock->driverdata && ret == 1) ((qsocket_t *)sock->driverdata)->canSend = true;