From 86056fdbd923fbf55f85b3db704bba021ea90c4f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 8 Aug 2013 10:06:39 -0400 Subject: Generalize unlink to OS-dep code in Utils, just a little prep for Windows port. --- node/Network.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'node/Network.cpp') diff --git a/node/Network.cpp b/node/Network.cpp index 127de917..94eef23f 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -111,8 +111,8 @@ Network::~Network() if (_destroyOnDelete) { std::string confPath(_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + toString() + ".conf"); std::string mcdbPath(_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + toString() + ".mcerts"); - unlink(confPath.c_str()); - unlink(mcdbPath.c_str()); + Utils::rm(confPath); + Utils::rm(mcdbPath); } else { // Causes flush of membership certs to disk clean(); @@ -204,7 +204,7 @@ void Network::clean() Mutex::Lock _l(_lock); if (_configuration.isOpen()) { _membershipCertificates.clear(); - unlink(mcdbPath.c_str()); + Utils::rm(mcdbPath); } else { FILE *mcdb = fopen(mcdbPath.c_str(),"wb"); bool writeError = false; @@ -236,7 +236,7 @@ void Network::clean() if (mcdb) fclose(mcdb); if (writeError) { - unlink(mcdbPath.c_str()); + Utils::rm(mcdbPath); LOG("error: unable to write to membership cert database at: %s",mcdbPath.c_str()); } } -- cgit v1.2.3