From: special <special@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Fri, 20 Jun 2008 02:04:53 +0000 (+0000)
Subject: It is unnecessary and rather less efficient to use memmove() everywhere; it's only... 
X-Git-Tag: v2.0.23~3002
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=68b3561749552e5e73d1d684b723b3ea6abe5186;p=user%2Fhenk%2Fcode%2Finspircd.git

It is unnecessary and rather less efficient to use memmove() everywhere; it's only needed when the buffers may overlap.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9927 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 0eb293d27..fb50c0f09 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -543,7 +543,7 @@ class ModuleSSLGnuTLS : public Module
 
 				if(count <= length)
 				{
-					memmove(buffer, session->inbuf, count);
+					memcpy(buffer, session->inbuf, count);
 					// Move the stuff left in inbuf to the beginning of it
 					memmove(session->inbuf, session->inbuf + count, (length - count));
 					// Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp.
@@ -554,7 +554,7 @@ class ModuleSSLGnuTLS : public Module
 				else
 				{
 					// There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing.
-					memmove(buffer, session->inbuf, length);
+					memcpy(buffer, session->inbuf, length);
 					// Zero the offset, as there's nothing there..
 					session->inbufoffset = 0;
 					// As above
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 0c9307ae4..4368c8d47 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -525,7 +525,7 @@ class ModuleSSLOpenSSL : public Module
 				{
 					if (count <= session->inbufoffset)
 					{
-						memmove(buffer, session->inbuf, count);
+						memcpy(buffer, session->inbuf, count);
 						// Move the stuff left in inbuf to the beginning of it
 						memmove(session->inbuf, session->inbuf + count, (session->inbufoffset - count));
 						// Now we need to set session->inbufoffset to the amount of data still waiting to be handed to insp.
@@ -536,7 +536,7 @@ class ModuleSSLOpenSSL : public Module
 					else
 					{
 						// There's not as much in the inbuf as there is space in the buffer, so just copy the whole thing.
-						memmove(buffer, session->inbuf, session->inbufoffset);
+						memcpy(buffer, session->inbuf, session->inbufoffset);
 
 						readresult = session->inbufoffset;
 						// Zero the offset, as there's nothing there..