From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Fri, 6 Jan 2012 09:28:46 +0000 (-0200)
Subject: Improved: changed copy's arguments format to improve readability.
X-Git-Tag: v1.3~11^2~49
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=66c3a9164348bb8b77baf65d31e5937bd80992c2;p=pingcheck

Improved: changed copy's arguments format to improve readability.
- Changed from pointer arithmetic to array indexes.
---

diff --git a/src/host/messagepayload.cpp b/src/host/messagepayload.cpp
index 737624f..cb00b1e 100644
--- a/src/host/messagepayload.cpp
+++ b/src/host/messagepayload.cpp
@@ -166,17 +166,19 @@ void MessagePayload::append(
         size_t new_payload_size_in_bytes = old_payload_size_in_bytes + extra_payload_size_in_bytes;
         uint8_t *new_payload_data = new uint8_t[ new_payload_size_in_bytes ];
 
-        copy( old_payload_data, old_payload_data + old_payload_size_in_bytes, new_payload_data );
-        copy( extra_payload_data, extra_payload_data + extra_payload_size_in_bytes, new_payload_data + old_payload_size_in_bytes );
+        copy( &old_payload_data[0], &old_payload_data[old_payload_size_in_bytes], &new_payload_data[0] );
+        copy( &extra_payload_data[0], &extra_payload_data[extra_payload_size_in_bytes], &new_payload_data[old_payload_size_in_bytes] );
 
         Payload.reset( new_payload_data );
         PayloadSizeInBytes = new_payload_size_in_bytes;
 
 #ifndef BOOST_DISABLE_ASSERTS
         BOOST_ASSERT( PayloadSizeInBytes == ( old_payload_size_in_bytes + extra_payload_size_in_bytes ) );
+
         uint8_t *original_data_begin = Payload.get();
         uint8_t *original_data_end = Payload.get() + old_payload_size_in_bytes;
         BOOST_ASSERT( equal( original_data_begin, original_data_end, old_payload_data ) );
+
         uint8_t *extra_data_begin = Payload.get() + old_payload_size_in_bytes;
         uint8_t *extra_data_end = Payload.get() + old_payload_size_in_bytes + extra_payload_size_in_bytes;
         BOOST_ASSERT( equal( extra_data_begin, extra_data_end, extra_payload_data ) );