[#2830] fixed UB for function pointer type

diff --git a/src/bin/dhcp4/tests/callout_library_1.cc b/src/bin/dhcp4/tests/callout_library_1.cc
index c531bb998ff370804071f823a76a4b856ab277f1..7c16b03c758174ea0882f460e71239c5028fde6f 100644 (file)
--- a/src/bin/dhcp4/tests/callout_library_1.cc
+++ b/src/bin/dhcp4/tests/callout_library_1.cc
@@ -22,7 +22,7 @@ extern "C" {
 
 int (*do_load)(isc::hooks::LibraryHandle& handle);
 
-int (*do_unload)(isc::hooks::LibraryHandle& handle);
+int (*do_unload)();
 
 /// @brief This function is called to retrieve the multi-threading compatibility.
 ///

diff --git a/src/bin/dhcp4/tests/callout_library_2.cc b/src/bin/dhcp4/tests/callout_library_2.cc
index d22b83a8231bd849953dc6ce2be3ce6c4c5cdcf3..6059340272e001599877b8fd88f220e51d4473b6 100644 (file)
--- a/src/bin/dhcp4/tests/callout_library_2.cc
+++ b/src/bin/dhcp4/tests/callout_library_2.cc
@@ -19,6 +19,6 @@ extern "C" {
 
 int (*do_load)(isc::hooks::LibraryHandle& handle);
 
-int (*do_unload)(isc::hooks::LibraryHandle& handle);
+int (*do_unload)();
 
 }

diff --git a/src/bin/dhcp4/tests/callout_library_3.cc b/src/bin/dhcp4/tests/callout_library_3.cc
index a08ab903115887214746293700a22fd7add41fe6..6bd0fa35699b43b43a96797cb779a39877b3d566 100644 (file)
--- a/src/bin/dhcp4/tests/callout_library_3.cc
+++ b/src/bin/dhcp4/tests/callout_library_3.cc
@@ -40,7 +40,7 @@ do_load_impl(LibraryHandle& handle) {
 
 int (*do_load)(isc::hooks::LibraryHandle& handle) = do_load_impl;
 
-int (*do_unload)(isc::hooks::LibraryHandle& handle);
+int (*do_unload)();
 
 /// @brief Callout which appends library number and provided arguments to
 /// the marker file for dhcp4_srv_configured callout.

diff --git a/src/bin/dhcp4/tests/callout_library_common.h b/src/bin/dhcp4/tests/callout_library_common.h
index d16e4a71d9fb472b7c42b0d6d3d6a2ffe930cb6d..0732019a14e5087479eb8f95a99ae8be6930178e 100644 (file)
--- a/src/bin/dhcp4/tests/callout_library_common.h
+++ b/src/bin/dhcp4/tests/callout_library_common.h
@@ -35,7 +35,7 @@ extern "C" {
 
 extern int (*do_load)(isc::hooks::LibraryHandle& handle);
 
-extern int (*do_unload)(isc::hooks::LibraryHandle& handle);
+extern int (*do_unload)();
 
 /// @brief Append digit to marker file
 ///
@@ -98,11 +98,11 @@ load(isc::hooks::LibraryHandle& handle) {
 }
 
 int
-unload(isc::hooks::LibraryHandle& handle) {
+unload() {
     int result = 0;
     result = appendDigit(UNLOAD_MARKER_FILE);
     if (result == 0 && do_unload) {
-        result = do_unload(handle);
+        result = do_unload();
     }
     return (result);
 }

diff --git a/src/bin/dhcp6/tests/callout_library_1.cc b/src/bin/dhcp6/tests/callout_library_1.cc
index cbb03c322fcc8262de3e6775ac2f84e8a16a4f33..356862b5d8d0a4af1f03ee00a381192989bb4fc4 100644 (file)
--- a/src/bin/dhcp6/tests/callout_library_1.cc
+++ b/src/bin/dhcp6/tests/callout_library_1.cc
@@ -22,7 +22,7 @@ extern "C" {
 
 int (*do_load)(isc::hooks::LibraryHandle& handle);
 
-int (*do_unload)(isc::hooks::LibraryHandle& handle);
+int (*do_unload)();
 
 /// @brief This function is called to retrieve the multi-threading compatibility.
 ///

diff --git a/src/bin/dhcp6/tests/callout_library_2.cc b/src/bin/dhcp6/tests/callout_library_2.cc
index bd7d1bfc84cf3aca0cfa9f6683644a423dda3b44..12354e66cfcc3c9320345ea1df47db3eeb59588a 100644 (file)
--- a/src/bin/dhcp6/tests/callout_library_2.cc
+++ b/src/bin/dhcp6/tests/callout_library_2.cc
@@ -19,6 +19,6 @@ extern "C" {
 
 int (*do_load)(isc::hooks::LibraryHandle& handle);
 
-int (*do_unload)(isc::hooks::LibraryHandle& handle);
+int (*do_unload)();
 
 }

diff --git a/src/bin/dhcp6/tests/callout_library_3.cc b/src/bin/dhcp6/tests/callout_library_3.cc
index eccaf8d6d56d8894eb140ecb08b673d3c8b175d4..c8e212eac0ea1ad521e8589117170100418f3b25 100644 (file)
--- a/src/bin/dhcp6/tests/callout_library_3.cc
+++ b/src/bin/dhcp6/tests/callout_library_3.cc
@@ -39,7 +39,7 @@ do_load_impl(LibraryHandle& handle) {
 
 int (*do_load)(isc::hooks::LibraryHandle& handle) = do_load_impl;
 
-int (*do_unload)(isc::hooks::LibraryHandle& handle);
+int (*do_unload)();
 
 /// @brief Callout which appends library number and provided arguments to
 /// the marker file for dhcp6_srv_configured callout.

diff --git a/src/bin/dhcp6/tests/callout_library_common.h b/src/bin/dhcp6/tests/callout_library_common.h
index 54efc8dfc6c2c70a0946306b3266488503b4c112..d3c6d94b77c5e7c0e1d4e80bc8513b22473a9d97 100644 (file)
--- a/src/bin/dhcp6/tests/callout_library_common.h
+++ b/src/bin/dhcp6/tests/callout_library_common.h
@@ -35,7 +35,7 @@ extern "C" {
 
 extern int (*do_load)(isc::hooks::LibraryHandle& handle);
 
-extern int (*do_unload)(isc::hooks::LibraryHandle& handle);
+extern int (*do_unload)();
 
 /// @brief Append digit to marker file
 ///
@@ -98,11 +98,11 @@ load(isc::hooks::LibraryHandle& handle) {
 }
 
 int
-unload(isc::hooks::LibraryHandle& handle) {
+unload() {
     int result = 0;
     result = appendDigit(UNLOAD_MARKER_FILE);
     if (result == 0 && do_unload) {
-        result = do_unload(handle);
+        result = do_unload();
     }
     return (result);
 }