From 5035fdfe9be9ce82d3f6c6affa310e8763d7b102 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 17 Jan 2007 21:59:13 +0000 Subject: Moved MakeFullPath into its own library file so that we can share it (BackupQueries needs it too) (refs #3) --- bin/bbackupd/BackupClientDirectoryRecord.cpp | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'bin') diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index 1cc10d99..43824130 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -29,6 +29,7 @@ #include "BackupDaemon.h" #include "BackupStoreException.h" #include "Archive.h" +#include "PathUtils.h" #include "MemLeakFindOn.h" @@ -94,33 +95,6 @@ void BackupClientDirectoryRecord::DeleteSubDirectories() mSubDirectories.clear(); } -// -------------------------------------------------------------------------- -// -// Function -// Name: MakeFullPath(const std::string& rDir, const std::string& rFile) -// Purpose: Combine directory and file name -// Created: 2006/08/10 -// -// -------------------------------------------------------------------------- -static std::string MakeFullPath(const std::string& rDir, - const std::string& rFile) -{ - std::string result; - - if (rDir.size() > 0 && - rDir[rDir.size()-1] == DIRECTORY_SEPARATOR_ASCHAR) - { - result = rDir + rFile; - } - else - { - result = rDir + DIRECTORY_SEPARATOR + rFile; - } - - return result; -} - - // -------------------------------------------------------------------------- // // Function -- cgit v1.2.3