Reorganize arguments to BOOST_REQUIRE_MESSAGE

Static analysis tools were complaining about assignment.

Change-Id: Iea9530b718d4aa823e01293fb6a81c95a9055f5c

diff --git a/test/cs_test.cc b/test/cs_test.cc
index a0695fc..a6dc199 100644 (file)
--- a/test/cs_test.cc
+++ b/test/cs_test.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *  Copyright (c) 2016-2019 Samsung Electronics Co., Ltd All Rights Reserved
  *
  *  Contact: Kyungwook Tak <k.tak@samsung.com>
  *
@@ -68,8 +68,8 @@ static void derive_key_with_pass(const char *pass, int passlen)
 
     constexpr unsigned int KeyLen = 20;
     unsigned char *key = nullptr;
-    BOOST_REQUIRE_MESSAGE(
-        (retval = cs_derive_key_with_pass(pass, passlen, KeyLen, &key)) == CS_ERROR_NONE,
+    retval = cs_derive_key_with_pass(pass, passlen, KeyLen, &key);
+    BOOST_REQUIRE_MESSAGE(retval == CS_ERROR_NONE,
         "Failed to cs_derive_key_with_pass with retval: " << retval);
 
     std::unique_ptr<unsigned char, void(*)(void *)> pKey(key, free);