diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-12-10 19:17:02 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-12-10 19:17:02 +0000 |
| commit | 774201207329ebe4a7a32892b6c5f40e55fe2c86 (patch) | |
| tree | d0f51b1e1213844dec040f5bb0f9f1f63e1453e1 /bin/bbackupd | |
| parent | 0ca7a7422d81795430c685e4f50de6678205bfe3 (diff) | |
Whitespace and comment formatting fixes.
Diffstat (limited to 'bin/bbackupd')
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 16 | ||||
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 5 |
2 files changed, 9 insertions, 12 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index 55c154fe..c0a9dab9 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -241,21 +241,20 @@ void BackupClientDirectoryRecord::SyncDirectory( EMU_STRUCT_STAT link_st; if(EMU_LSTAT(rLocalPath.c_str(), &link_st) != 0) { - // Report the error (logs and - // eventual email to administrator) - rNotifier.NotifyFileStatFailed(this, + // Report the error (logs and eventual email to administrator) + rNotifier.NotifyFileStatFailed(this, ConvertVssPathToRealPath(rLocalPath, rBackupLocation), strerror(errno)); - - // FIXME move to NotifyFileStatFailed() + + // TODO FIXME move to NotifyFileStatFailed() SetErrorWhenReadingFilesystemObject(rParams, rLocalPath); - + // This shouldn't happen, so we'd better not continue THROW_EXCEPTION(CommonException, OSFileError) } // BLOCK - { + { // read the contents... DIR *dirHandle = 0; try @@ -267,8 +266,7 @@ void BackupClientDirectoryRecord::SyncDirectory( dirHandle = ::opendir(rLocalPath.c_str()); if(dirHandle == 0) { - // Report the error (logs and - // eventual email to administrator) + // Report the error (logs and eventual email to administrator) if (errno == EACCES) { rNotifier.NotifyDirListFailed(this, diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index 713185f8..60efaa0e 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -756,9 +756,8 @@ std::auto_ptr<BackupClientContext> BackupDaemon::RunSyncNowWithExceptionHandling // Handle restart? if(StopRun()) { - BOX_NOTICE("Exception (" << errorCode - << "/" << errorSubCode - << ") due to signal"); + BOX_NOTICE("Exception (" << errorCode << "/" << + errorSubCode << ") due to signal"); OnBackupFinish(); return mapClientContext; // releases mapClientContext } |