Bug #33144650 FIX COMPILER WARNINGS FROM VISUAL STUDIO [mysql_keyring…

…, noclose]

This patch fixes warnings so that the targets
mysql_keyring_encryption_test and mysql_migrate_keyring
have a clean build with --config Debug.

Warnings fixed:

 - warning C4805: '==': unsafe mix of type 'mysql_service_status_t'
   and type 'bool' in operation

Change-Id: I93713c38dc6c6d2dff3325c370d3ec35737c9622

client/migrate_keyring/components.cc

@@ -107,7 +107,7 @@ Keyring_services::Keyring_services(const std::string implementation_name,
 
   if (keyring_load_service_->load(
           Options::s_component_dir,
-          instance_path.length() ? instance_path.c_str() : nullptr) == true) {
+          instance_path.length() ? instance_path.c_str() : nullptr) != 0) {
     std::string message("Failed to initialize keyring");
     log_error << message << std::endl;
     return;
@@ -189,7 +189,7 @@ Keyring_migrate::Keyring_migrate(Source_keyring_services &src,
     return;
   }
   auto iterator = src_.metadata_iterator();
-  if (iterator->init(&iterator_) == true) {
+  if (iterator->init(&iterator_) != 0) {
     log_error << "Error creating source keyring iterator" << std::endl;
     return;
   }
@@ -233,7 +233,7 @@ bool Keyring_migrate::migrate_keys() {
     auth_id_length = 0;
     /* Fetch length */
     if (metadata_iterator->get_length(iterator_, &data_id_length,
-                                      &auth_id_length) == true) {
+                                      &auth_id_length) != 0) {
       log_error << "Could not fetch next available key content from keyring"
                 << std::endl;
       retval = false;
@@ -251,7 +251,7 @@ bool Keyring_migrate::migrate_keys() {
     }
     /* Fetch metadata of next available key */
     if (metadata_iterator->get(iterator_, data_id.get(), data_id_length + 1,
-                               auth_id.get(), auth_id_length + 1) == true) {
+                               auth_id.get(), auth_id_length + 1) != 0) {
       log_error << "Could not fetch next available key content from keyring"
                 << std::endl;
       retval = false;
@@ -278,15 +278,14 @@ bool Keyring_migrate::migrate_keys() {
 
     auto cleanup_guard = create_scope_guard([&] {
       if (reader_object != nullptr) {
-        if (reader->deinit(reader_object) == true)
+        if (reader->deinit(reader_object) != 0)
           log_error << "Failed to deallocated reader_object" << std::endl;
       }
       reader_object = nullptr;
     });
 
     size_t data_size, data_type_size;
-    if (reader->fetch_length(reader_object, &data_size, &data_type_size) ==
-        true) {
+    if (reader->fetch_length(reader_object, &data_size, &data_type_size) != 0) {
       log_warning << "Could not find data pointed by data_id: " << data_id.get()
                   << ", auth_id: " << auth_id.get() << ". Skipping"
                   << std::endl;
@@ -322,7 +321,7 @@ bool Keyring_migrate::migrate_keys() {
 
     if (reader->fetch(reader_object, data_buffer.get(), data_size, &data_size,
                       data_type_buffer.get(), data_type_size + 1,
-                      &data_type_size) == true) {
+                      &data_type_size) != 0) {
       log_warning << "Could not find data pointed by data_id: " << data_id.get()
                   << ", auth_id: " << auth_id.get() << ". Skipping"
                   << std::endl;
@@ -351,7 +350,7 @@ bool Keyring_migrate::migrate_keys() {
     ++migrated_count;
   }
 
-  if (metadata_iterator->deinit(iterator_) == true) {
+  if (metadata_iterator->deinit(iterator_) != 0) {
     log_error << "Failed to deinitialize source iterator" << std::endl;
     retval = false;
   }

components/test/keyring_encryption_test/components.cc

@@ -83,7 +83,7 @@ Keyring_services::Keyring_services(const std::string implementation_name)
   if (keyring_load_service_) return;
 
   /* We do not support non-default location for config file yet */
-  if (keyring_load_service_->load(Options::s_component_dir, nullptr) == true)
+  if (keyring_load_service_->load(Options::s_component_dir, nullptr) != 0)
     return;
 
   ok_ = true;
@@ -126,15 +126,15 @@ bool Keyring_encryption_test::test_aes() {
   std::string aes_key_1("AES_test_key_1");
   if (writer->store("aes_key_1", "keyring_aes_test",
                     reinterpret_cast<const unsigned char *>(aes_key_1.c_str()),
-                    aes_key_1.length(), "AES") == true) {
+                    aes_key_1.length(), "AES") != 0) {
     std::cerr << "Failed to store key [aes_key_1, keyring_aes_test] in keyring"
               << std::endl;
     return false;
   }
 
   if (writer->store("secret_key_1", "keyring_aes_test",
                     reinterpret_cast<const unsigned char *>(aes_key_1.c_str()),
-                    aes_key_1.length(), "SECRET") == true) {
+                    aes_key_1.length(), "SECRET") != 0) {
     std::cerr
         << "Failed to store key [secret_key_1, keyring_aes_test] in keyring"
         << std::endl;
@@ -147,7 +147,7 @@ bool Keyring_encryption_test::test_aes() {
   size_t plaintext_length = strlen(reinterpret_cast<const char *>(plaintext));
   size_t ciphertext_length = 0;
   if (aes->get_size(plaintext_length, mode.c_str(), block_size,
-                    &ciphertext_length) == true) {
+                    &ciphertext_length) != 0) {
     std::cerr << "Failed to obtain ciphertext size" << std::endl;
     return false;
   }
@@ -180,7 +180,7 @@ bool Keyring_encryption_test::test_aes() {
   if (aes->encrypt("aes_key_1", "keyring_aes_test", mode.c_str(), block_size,
                    reinterpret_cast<const unsigned char *>(iv1.c_str()),
                    padding, plaintext, plaintext_length, output_1.get(),
-                   ciphertext_length, &ciphertext_length) == true) {
+                   ciphertext_length, &ciphertext_length) != 0) {
     std::cerr << "Failed to encrypt plaintext using AES-CBC-256" << std::endl;
     return false;
   }
@@ -189,7 +189,7 @@ bool Keyring_encryption_test::test_aes() {
 
   size_t decrypted_length = 0;
   if (aes->get_size(ciphertext_length, mode.c_str(), block_size,
-                    &decrypted_length) == true) {
+                    &decrypted_length) != 0) {
     std::cerr << "Failed to obtain painttext size" << std::endl;
     return false;
   }
@@ -222,7 +222,7 @@ bool Keyring_encryption_test::test_aes() {
   if (aes->decrypt("aes_key_1", "keyring_aes_test", mode.c_str(), block_size,
                    reinterpret_cast<const unsigned char *>(iv1.c_str()),
                    padding, output_1.get(), ciphertext_length, output_2.get(),
-                   decrypted_length, &decrypted_length) == true) {
+                   decrypted_length, &decrypted_length) != 0) {
     std::cerr << "Failed to decrypt plaintext using AES-CBC-256" << std::endl;
     return false;
   }
@@ -231,14 +231,14 @@ bool Keyring_encryption_test::test_aes() {
 
   std::cout << "Decrypted plaintext: '" << output_2.get() << "'" << std::endl;
 
-  if (writer->remove("secret_key_1", "keyring_aes_test") == true) {
+  if (writer->remove("secret_key_1", "keyring_aes_test") != 0) {
     std::cerr
         << "Failed to remove key [secret_key_1, keyring_aes_test] from keyring"
         << std::endl;
     return false;
   }
 
-  if (writer->remove("aes_key_1", "keyring_aes_test") == true) {
+  if (writer->remove("aes_key_1", "keyring_aes_test") != 0) {
     std::cerr
         << "Failed to remove key [aes_key_1, keyring_aes_test] from keyring"
         << std::endl;