[master] Some other/new s/unlink/remove/

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 648c267d44649fce6206c278bd9e30f9fc1b3634..e645444109bf120b5a22114bede577102c324a2a 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -209,8 +209,8 @@ public:
         HooksManager::unloadLibraries();
 
         // Get rid of any marker files.
-        static_cast<void>(unlink(LOAD_MARKER_FILE));
-        static_cast<void>(unlink(UNLOAD_MARKER_FILE));
+        static_cast<void>(remove(LOAD_MARKER_FILE));
+        static_cast<void>(remove(UNLOAD_MARKER_FILE));
         IfaceMgr::instance().deleteAllExternalSockets();
         CfgMgr::instance().clear();
     }

diff --git a/src/bin/dhcp6/tests/dhcp6_test_utils.cc b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
index ace8bbfb285e4fe41d00036a1918cea85056063e..9e6fe0fd99415d075737862ad4fa9e93dff6818d 100644 (file)
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@ -834,7 +834,7 @@ Dhcpv6SrvTest::configure(const std::string& config, NakedDhcpv6Srv& srv) {
 NakedDhcpv6SrvTest::NakedDhcpv6SrvTest()
 : rcode_(-1) {
     // it's ok if that fails. There should not be such a file anyway
-    unlink(DUID_FILE);
+    remove(DUID_FILE);
 
     const isc::dhcp::IfaceMgr::IfaceCollection& ifaces =
         isc::dhcp::IfaceMgr::instance().getIfaces();
@@ -856,7 +856,7 @@ NakedDhcpv6SrvTest::~NakedDhcpv6SrvTest() {
     isc::stats::StatsMgr::instance().removeAll();
 
     // Let's clean up if there is such a file.
-    unlink(DUID_FILE);
+    remove(DUID_FILE);
     isc::hooks::HooksManager::preCalloutsLibraryHandle()
         .deregisterAllCallouts("buffer6_receive");
     isc::hooks::HooksManager::preCalloutsLibraryHandle()