From a8731377026359c2bd673cfe286a33dfbd7366b2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 3 Sep 2019 19:49:10 +0200 Subject: [PATCH] db/update/VirtualDirectory: rename MakeDirectoryIfModified() --- src/db/update/Container.cxx | 3 ++- src/db/update/VirtualDirectory.cxx | 4 ++-- src/db/update/Walk.hxx | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/db/update/Container.cxx b/src/db/update/Container.cxx index d95e0727f..1be6ace29 100644 --- a/src/db/update/Container.cxx +++ b/src/db/update/Container.cxx @@ -45,7 +45,8 @@ UpdateWalk::UpdateContainerFile(Directory &directory, Directory *contdir; { const ScopeDatabaseLock protect; - contdir = MakeDirectoryIfModified(directory, name, info); + contdir = MakeVirtualDirectoryIfModified(directory, name, + info); if (contdir == nullptr) /* not modified */ return true; diff --git a/src/db/update/VirtualDirectory.cxx b/src/db/update/VirtualDirectory.cxx index 8b0115e8d..de1d50695 100644 --- a/src/db/update/VirtualDirectory.cxx +++ b/src/db/update/VirtualDirectory.cxx @@ -22,8 +22,8 @@ #include "storage/FileInfo.hxx" Directory * -UpdateWalk::MakeDirectoryIfModified(Directory &parent, const char *name, - const StorageFileInfo &info) noexcept +UpdateWalk::MakeVirtualDirectoryIfModified(Directory &parent, const char *name, + const StorageFileInfo &info) noexcept { Directory *directory = parent.FindChild(name); diff --git a/src/db/update/Walk.hxx b/src/db/update/Walk.hxx index ea58ba264..03efe0d4c 100644 --- a/src/db/update/Walk.hxx +++ b/src/db/update/Walk.hxx @@ -142,8 +142,9 @@ private: * * The caller must lock the database. */ - Directory *MakeDirectoryIfModified(Directory &parent, const char *name, - const StorageFileInfo &info) noexcept; + Directory *MakeVirtualDirectoryIfModified(Directory &parent, + const char *name, + const StorageFileInfo &info) noexcept; Directory *DirectoryMakeChildChecked(Directory &parent, const char *uri_utf8,