Merge pull request #9 from viktor-av/minor-fixes

romainreignier · web-flow · commit 5f27dd6b4c66 · 2025-11-05T09:24:43.000+01:00
Minor fixes for buffer handling
diff --git a/include/ixblue_stdbin_decoder/memory_block_parser.h b/include/ixblue_stdbin_decoder/memory_block_parser.h
@@ -16,8 +16,7 @@ boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf,
 {
     for(auto& b : res)
     {
-        const auto byte = boost::asio::buffer(buf, 1);
-        b = *boost::asio::buffer_cast<const uint8_t*>(byte);
+        b = *boost::asio::buffer_cast<const uint8_t*>(buf);
         buf = buf + sizeof(uint8_t);
     }
     return buf;
diff --git a/src/memory_block_parser.cpp b/src/memory_block_parser.cpp
@@ -1,9 +1,9 @@
 #include <stdexcept>
 
-#include <boost/endian/conversion.hpp>
-
 #include <ixblue_stdbin_decoder/memory_block_parser.h>
 
+#include <boost/endian/conversion.hpp>
+
 namespace ixblue_stdbin_decoder
 {
 
@@ -14,7 +14,7 @@ void MemoryBlockParser::parse(boost::asio::const_buffer& buffer, const tBitMask&
     if(mask.test(offsetInMask))
     {
         // And there is enough bytes in buffer we can parse it :
-        if(boost::asio::buffer_size(buffer) >= bytesCount)
+        if(buffer.size() >= bytesCount)
         {
             parse(buffer, outBinaryNav);
         }
@@ -28,50 +28,44 @@ void MemoryBlockParser::parse(boost::asio::const_buffer& buffer, const tBitMask&
 
 boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, double& res)
 {
-    uint64_t bytes = *boost::asio::buffer_cast<const uint64_t*>(buf);
-    boost::endian::big_to_native_inplace(bytes);
+    uint64_t bytes = boost::endian::big_to_native(*boost::asio::buffer_cast<const uint64_t*>(buf));
     std::memcpy(&res, &bytes, sizeof(double));
     buf = buf + sizeof(double);
     return buf;
 }
 
 boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, float& res)
 {
-    uint32_t bytes = *boost::asio::buffer_cast<const uint32_t*>(buf);
-    boost::endian::big_to_native_inplace(bytes);
+    uint32_t bytes = boost::endian::big_to_native(*boost::asio::buffer_cast<const uint32_t*>(buf));
     std::memcpy(&res, &bytes, sizeof(float));
     buf = buf + sizeof(float);
     return buf;
 }
 
 boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, int32_t& res)
 {
-    res = *boost::asio::buffer_cast<const int32_t*>(buf);
-    boost::endian::big_to_native_inplace(res);
+    res = boost::endian::big_to_native(*boost::asio::buffer_cast<const int32_t*>(buf));
     buf = buf + sizeof(int32_t);
     return buf;
 }
 
 boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, uint64_t& res)
 {
-    res = *boost::asio::buffer_cast<const uint64_t*>(buf);
-    boost::endian::big_to_native_inplace(res);
+    res = boost::endian::big_to_native(*boost::asio::buffer_cast<const uint64_t*>(buf));
     buf = buf + sizeof(uint64_t);
     return buf;
 }
 
 boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, uint32_t& res)
 {
-    res = *boost::asio::buffer_cast<const uint32_t*>(buf);
-    boost::endian::big_to_native_inplace(res);
+    res = boost::endian::big_to_native(*boost::asio::buffer_cast<const uint32_t*>(buf));
     buf = buf + sizeof(uint32_t);
     return buf;
 }
 
 boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, uint16_t& res)
 {
-    res = *boost::asio::buffer_cast<const uint16_t*>(buf);
-    boost::endian::big_to_native_inplace(res);
+    res = boost::endian::big_to_native(*boost::asio::buffer_cast<const uint16_t*>(buf));
     buf = buf + sizeof(uint16_t);
     return buf;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf,`
`16`	`16`	`{`
`17`	`17`	`for(auto& b : res)`
`18`	`18`	`{`
`19`		`- const auto byte = boost::asio::buffer(buf, 1);`
`20`		`- b = boost::asio::buffer_cast<const uint8_t>(byte);`
	`19`	`+ b = boost::asio::buffer_cast<const uint8_t>(buf);`
`21`	`20`	`buf = buf + sizeof(uint8_t);`
`22`	`21`	`}`
`23`	`22`	`return buf;`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#include <stdexcept>`
`2`	`2`
`3`		`-#include <boost/endian/conversion.hpp>`
`4`		`-`
`5`	`3`	`#include <ixblue_stdbin_decoder/memory_block_parser.h>`
`6`	`4`
	`5`	`+#include <boost/endian/conversion.hpp>`
	`6`	`+`
`7`	`7`	`namespace ixblue_stdbin_decoder`
`8`	`8`	`{`
`9`	`9`
`@@ -14,7 +14,7 @@ void MemoryBlockParser::parse(boost::asio::const_buffer& buffer, const tBitMask&`
`14`	`14`	`if(mask.test(offsetInMask))`
`15`	`15`	`{`
`16`	`16`	`// And there is enough bytes in buffer we can parse it :`
`17`		`- if(boost::asio::buffer_size(buffer) >= bytesCount)`
	`17`	`+ if(buffer.size() >= bytesCount)`
`18`	`18`	`{`
`19`	`19`	`parse(buffer, outBinaryNav);`
`20`	`20`	`}`
`@@ -28,50 +28,44 @@ void MemoryBlockParser::parse(boost::asio::const_buffer& buffer, const tBitMask&`
`28`	`28`
`29`	`29`	`boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, double& res)`
`30`	`30`	`{`
`31`		`- uint64_t bytes = boost::asio::buffer_cast<const uint64_t>(buf);`
`32`		`- boost::endian::big_to_native_inplace(bytes);`
	`31`	`+ uint64_t bytes = boost::endian::big_to_native(boost::asio::buffer_cast<const uint64_t>(buf));`
`33`	`32`	`std::memcpy(&res, &bytes, sizeof(double));`
`34`	`33`	`buf = buf + sizeof(double);`
`35`	`34`	`return buf;`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, float& res)`
`39`	`38`	`{`
`40`		`- uint32_t bytes = boost::asio::buffer_cast<const uint32_t>(buf);`
`41`		`- boost::endian::big_to_native_inplace(bytes);`
	`39`	`+ uint32_t bytes = boost::endian::big_to_native(boost::asio::buffer_cast<const uint32_t>(buf));`
`42`	`40`	`std::memcpy(&res, &bytes, sizeof(float));`
`43`	`41`	`buf = buf + sizeof(float);`
`44`	`42`	`return buf;`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, int32_t& res)`
`48`	`46`	`{`
`49`		`- res = boost::asio::buffer_cast<const int32_t>(buf);`
`50`		`- boost::endian::big_to_native_inplace(res);`
	`47`	`+ res = boost::endian::big_to_native(boost::asio::buffer_cast<const int32_t>(buf));`
`51`	`48`	`buf = buf + sizeof(int32_t);`
`52`	`49`	`return buf;`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, uint64_t& res)`
`56`	`53`	`{`
`57`		`- res = boost::asio::buffer_cast<const uint64_t>(buf);`
`58`		`- boost::endian::big_to_native_inplace(res);`
	`54`	`+ res = boost::endian::big_to_native(boost::asio::buffer_cast<const uint64_t>(buf));`
`59`	`55`	`buf = buf + sizeof(uint64_t);`
`60`	`56`	`return buf;`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, uint32_t& res)`
`64`	`60`	`{`
`65`		`- res = boost::asio::buffer_cast<const uint32_t>(buf);`
`66`		`- boost::endian::big_to_native_inplace(res);`
	`61`	`+ res = boost::endian::big_to_native(boost::asio::buffer_cast<const uint32_t>(buf));`
`67`	`62`	`buf = buf + sizeof(uint32_t);`
`68`	`63`	`return buf;`
`69`	`64`	`}`
`70`	`65`
`71`	`66`	`boost::asio::const_buffer& operator>>(boost::asio::const_buffer& buf, uint16_t& res)`
`72`	`67`	`{`
`73`		`- res = boost::asio::buffer_cast<const uint16_t>(buf);`
`74`		`- boost::endian::big_to_native_inplace(res);`
	`68`	`+ res = boost::endian::big_to_native(boost::asio::buffer_cast<const uint16_t>(buf));`
`75`	`69`	`buf = buf + sizeof(uint16_t);`
`76`	`70`	`return buf;`
`77`	`71`	`}`