From 44bf8bf038c9d0405103e080e962449efc25bd66 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 10 May 2006 09:41:19 +0000 Subject: * bin/bbackupquery/BackupQueries.cpp - Win32 compile fixes --- bin/bbackupquery/BackupQueries.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp index fa077918..e86bde1e 100644 --- a/bin/bbackupquery/BackupQueries.cpp +++ b/bin/bbackupquery/BackupQueries.cpp @@ -1187,7 +1187,7 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s std::string localDirDisplay; std::string storeDirDisplay; - if(!ConvertUtf8ToConsole(rLocalDir.c_str(), localDirDirsplay)) return; + if(!ConvertUtf8ToConsole(rLocalDir.c_str(), localDirDisplay)) return; if(!ConvertUtf8ToConsole(rStoreDir.c_str(), storeDirDisplay)) return; #else const std::string& localDirDisplay(rLocalDir); @@ -1560,7 +1560,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s // File name is also in UTF-8 encoding, // need to convert to console std::string fileNameDisplay; - if(!ConvertUtf8ToConsole(*i, fileNameDisplay)) return; + if(!ConvertUtf8ToConsole(i->c_str(), fileNameDisplay)) + return; #else const std::string& fileNameDisplay(*i); #endif @@ -1613,7 +1614,8 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s // Directory name is also in UTF-8 encoding, // need to convert to console std::string subdirNameDisplay; - if(!ConvertUtf8ToConsole(i->first, subdirNameDisplay)) + if(!ConvertUtf8ToConsole(i->first.c_str(), + subdirNameDisplay)) return; #else const std::string& subdirNameDisplay(i->first); @@ -1652,7 +1654,7 @@ void BackupQueries::Compare(int64_t DirID, const std::string &rStoreDir, const s // File name is also in UTF-8 encoding, // need to convert to console std::string fileNameDisplay; - if(!ConvertUtf8ToConsole(*i, fileNameDisplay)) + if(!ConvertUtf8ToConsole(i->c_str(), fileNameDisplay)) return; #else const std::string& fileNameDisplay(*i); -- cgit v1.2.3