[#1071] always cast to target type

9bcc1e81 · Razvan Becheriu · Tomek Mrugalski · c3f77065 · 9bcc1e81 · 9bcc1e81
Commit 9bcc1e81 authored Jan 21, 2020 by Razvan Becheriu Committed by Tomek Mrugalski Feb 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

src/lib/dhcpsrv/mysql_host_data_source.cc src/lib/dhcpsrv/mysql_host_data_source.cc +1 -5

src/lib/dhcpsrv/mysql_lease_mgr.cc src/lib/dhcpsrv/mysql_lease_mgr.cc +1 -4

No files found.
--- a/src/lib/dhcpsrv/mysql_host_data_source.cc
+++ b/src/lib/dhcpsrv/mysql_host_data_source.cc
@@ -189,11 +189,7 @@ public:
                                   std::vector<my_bools>& error) {
        for (size_t i = 0; i < error.size(); ++i) {
            error[i] = MLM_FALSE;
-#ifdef HAVE_MYSQL_MY_BOOL
+            bind[i].error = reinterpret_cast<my_bool*>(&error[i]);
-            bind[i].error = reinterpret_cast<char*>(&error[i]);
-#else
-            bind[i].error = reinterpret_cast<bool*>(&error[i]);
-#endif
        }
    };

--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -355,11 +355,8 @@ public:
                                   size_t count) {
        for (size_t i = 0; i < count; ++i) {
            error[i] = MLM_FALSE;
-#ifdef HAVE_MYSQL_MY_BOOL
-            bind[i].error = reinterpret_cast<char*>(&error[i]);
-#else
-            bind[i].error = &error[i];
 #endif
+            bind[i].error = reinterpret_cast<my_bool*>(&error[i]);
        }
    }