Fix a problem with ARCH_MAGIC length calculation

Author: serge1

.vscode/launch.json

@@ -27,6 +27,18 @@
             //"preLaunchTask": "ELFIO Test build",
             "miDebuggerPath": "/usr/bin/gdb"
         },
+        {
+          
+            "name": "(Windows) Launch",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/tests/Debug/ELFIOTest.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}/build/tests",
+            "environment": [],
+            "console": "externalTerminal"
+          },
         {
             "name": "Run ELF Dump",
             "type": "cppdbg",

ario/ario.hpp

@@ -381,7 +381,7 @@ class ario
                 std::optional<std::reference_wrapper<const ario::Member>>&
                     added_member )
     {
-        auto& new_member = members_.emplace_back( member );
+        auto& new_member   = members_.emplace_back( member );
         new_member.size    = data.size();
         new_member.pstream = nullptr;
         new_member.set_new_data( data );
@@ -432,11 +432,13 @@ class ario
     //! @return Error object indicating success or failure
     Result load_header()
     {
-        std::string magic( sizeof( ARCH_MAGIC ), ' ' );
-        pstream->read( &magic[0], sizeof( ARCH_MAGIC ) );
-        if ( magic != ARCH_MAGIC ) {
+        auto        arch_magic      = std::string( ARCH_MAGIC );
+        auto        arch_magic_size = arch_magic.size();
+        std::string magic( arch_magic_size, ' ' );
+        pstream->read( &magic[0], arch_magic_size );
+        if ( magic != arch_magic ) {
             return { std::string( "Invalid archive format. Expected magic: " ) +
-                     ARCH_MAGIC };
+                     arch_magic };
         }
 
         return {};
@@ -816,7 +818,7 @@ class ario
             if ( short_name.size() < 3 ) {
                 return std::nullopt;
             }
-            auto offset_in_dir = 0;
+            size_t offset_in_dir = 0;
             try {
                 offset_in_dir = std::stoul( std::string(
                     short_name.substr( 1, short_name.size() - 2 ) ) );

tests/ARIOTest.cpp

@@ -266,7 +266,7 @@ void compare_archives( const ario& archive1, const ario& archive2 )
 {
     ASSERT_EQ( archive1.members.size(), archive2.members.size() );
 
-    for ( auto i = 0; i < archive1.members.size(); ++i ) {
+    for ( size_t i = 0; i < archive1.members.size(); ++i ) {
         EXPECT_EQ( archive1.members[i].name, archive2.members[i].name );
         EXPECT_EQ( archive1.members[i].date, archive2.members[i].date );
         EXPECT_EQ( archive1.members[i].uid, archive2.members[i].uid );
@@ -542,7 +542,7 @@ TEST( ARIOTest, new_text_lib )
     std::vector<std::string> ref_names = {
         "123456789012345", "1234567890123456",   "12345678901234567",
         "12345",           "123456789012345678", "1234567" };
-    for ( auto i = 0; i < loaded_archive.members.size(); i++ ) {
+    for ( size_t i = 0; i < loaded_archive.members.size(); i++ ) {
         EXPECT_EQ( loaded_archive.members[i].name, ref_names[i] );
         EXPECT_EQ( loaded_archive.members[i].size, 5 );
         EXPECT_EQ( loaded_archive.members[i].data(), "data\n" );