Yet another

serge1 · serge1 · commit 5e4b5520c2c7 · 2025-08-07T18:37:59.000+03:00
diff --git a/ario/ario.hpp b/ario/ario.hpp
@@ -438,7 +438,7 @@ class ario
         pstream->read( &magic[0], arch_magic_size );
         if ( magic != arch_magic ) {
             return { std::string( "Invalid archive format. Expected magic: " ) +
-                     arch_magic };
+                     arch_magic + ", but got " + magic };
         }
 
         return {};
diff --git a/tests/ARIOTest.cpp b/tests/ARIOTest.cpp
@@ -46,7 +46,7 @@ TEST( ARIOTest, wrong_file_magic )
     auto result = archive.load( "ario/invalid_magic.a" );
     ASSERT_EQ( result.ok(), false );
     ASSERT_EQ( result.what(),
-               "Invalid archive format. Expected magic: !<arch>\n" );
+               "Invalid archive format. Expected magic: !<arch>\n, but got !<arkh>\n" );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -438,7 +438,7 @@ class ario`
`438`	`438`	`pstream->read( &magic[0], arch_magic_size );`
`439`	`439`	`if ( magic != arch_magic ) {`
`440`	`440`	`return { std::string( "Invalid archive format. Expected magic: " ) +`
`441`		`- arch_magic };`
	`441`	`+ arch_magic + ", but got " + magic };`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`return {};`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ TEST( ARIOTest, wrong_file_magic )`
`46`	`46`	`auto result = archive.load( "ario/invalid_magic.a" );`
`47`	`47`	`ASSERT_EQ( result.ok(), false );`
`48`	`48`	`ASSERT_EQ( result.what(),`
`49`		`- "Invalid archive format. Expected magic: !<arch>\n" );`
	`49`	`+ "Invalid archive format. Expected magic: !<arch>\n, but got !<arkh>\n" );`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`////////////////////////////////////////////////////////////////////////////////`