summaryrefslogtreecommitdiff
path: root/lib/db_file.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:21:41 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:21:41 +0200
commitd6301fca6b78db52d0d98f8e0799aba175ad2e59 (patch)
tree0380aac034e0d70ee058db07900d80ff20cfc81e /lib/db_file.cpp
parent5.7 (diff)
downloadFreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.gz
FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.bz2
FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.zip
5.8
Diffstat (limited to 'lib/db_file.cpp')
-rw-r--r--lib/db_file.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/db_file.cpp b/lib/db_file.cpp
index 3c61137b..8821fc66 100644
--- a/lib/db_file.cpp
+++ b/lib/db_file.cpp
@@ -1,7 +1,7 @@
// **************************************************************************
// * This file is part of the FreeFileSync project. It is distributed under *
// * GNU General Public License: http://www.gnu.org/licenses/gpl.html *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved *
// **************************************************************************
#include "db_file.h"
@@ -414,7 +414,7 @@ class UpdateLastSynchronousState
/*
1. filter by file name does *not* create a new hierarchy, but merely gives a different *view* on the existing file hierarchy
=> only update database entries matching this view!
- 2. Symlink handling *does* create a new (asymmetric) hierarchies during comparison
+ 2. Symlink handling *does* create a new (asymmetric) hierarchy during comparison
=> update all database entries!
*/
public:
@@ -741,10 +741,9 @@ void zen::saveLastSynchronousState(const BaseDirMapping& baseMapping) //throw Fi
if (streamIterRightOld != streamListRight.end())
streamListRight.erase(streamIterRightOld);
- //create/update DirInfo-streams
+ //create new session data
const std::string sessionID = zen::generateGUID();
- //fill in new
streamListLeft [sessionID] = std::move(updatedStreamLeft);
streamListRight[sessionID] = std::move(updatedStreamRight);
@@ -762,6 +761,6 @@ void zen::saveLastSynchronousState(const BaseDirMapping& baseMapping) //throw Fi
renameFile(dbNameLeftTmp, dbNameLeft); //
renameFile(dbNameRightTmp, dbNameRight); //
- guardTempFileLeft. dismiss(); //no need to delete temp file anymore
+ guardTempFileLeft. dismiss(); //no need to delete temp files anymore
guardTempFileRight.dismiss(); //
}
bgstack15