commit 14b52f4: [Minor] Rename file to a more appropriate name

Vsevolod Stakhov vsevolod at rspamd.com
Mon Oct 17 21:42:03 UTC 2022


Author: Vsevolod Stakhov
Date: 2022-10-17 11:07:58 +0100
URL: https://github.com/rspamd/rspamd/commit/14b52f4498c10625f3c16101cd34dec25a59bac6

[Minor] Rename file to a more appropriate name

---
 src/client/rspamc.cxx                              | 2 +-
 src/libserver/hyperscan_tools.cxx                  | 2 +-
 src/libserver/symcache/symcache_impl.cxx           | 2 +-
 src/libutil/CMakeLists.txt                         | 2 +-
 src/libutil/cxx/{locked_file.cxx => file_util.cxx} | 2 +-
 src/libutil/cxx/{locked_file.hxx => file_util.hxx} | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/client/rspamc.cxx b/src/client/rspamc.cxx
index e1699c200..973bb58a4 100644
--- a/src/client/rspamc.cxx
+++ b/src/client/rspamc.cxx
@@ -34,7 +34,7 @@
 #include "frozen/unordered_map.h"
 #include "fmt/format.h"
 #include "fmt/color.h"
-#include "libutil/cxx/locked_file.hxx"
+#include "libutil/cxx/file_util.hxx"
 #include "libutil/cxx/util.hxx"
 
 #ifdef HAVE_SYS_WAIT_H
diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx
index c861a4668..a2acc0c18 100644
--- a/src/libserver/hyperscan_tools.cxx
+++ b/src/libserver/hyperscan_tools.cxx
@@ -20,7 +20,7 @@
 #include "contrib/ankerl/unordered_dense.h"
 #include "contrib/ankerl/svector.h"
 #include "fmt/core.h"
-#include "libutil/cxx/locked_file.hxx"
+#include "libutil/cxx/file_util.hxx"
 #include "hs.h"
 #include "logger.h"
 #include "worker_util.h"
diff --git a/src/libserver/symcache/symcache_impl.cxx b/src/libserver/symcache/symcache_impl.cxx
index 961f270ce..c29b9d6d4 100644
--- a/src/libserver/symcache/symcache_impl.cxx
+++ b/src/libserver/symcache/symcache_impl.cxx
@@ -19,7 +19,7 @@
 #include "symcache_item.hxx"
 #include "symcache_runtime.hxx"
 #include "unix-std.h"
-#include "libutil/cxx/locked_file.hxx"
+#include "libutil/cxx/file_util.hxx"
 #include "libutil/cxx/util.hxx"
 #include "fmt/core.h"
 #include "contrib/t1ha/t1ha.h"
diff --git a/src/libutil/CMakeLists.txt b/src/libutil/CMakeLists.txt
index 7b3103720..d3dd26454 100644
--- a/src/libutil/CMakeLists.txt
+++ b/src/libutil/CMakeLists.txt
@@ -18,6 +18,6 @@ SET(LIBRSPAMDUTILSRC
 				${CMAKE_CURRENT_SOURCE_DIR}/heap.c
 				${CMAKE_CURRENT_SOURCE_DIR}/multipattern.c
 				${CMAKE_CURRENT_SOURCE_DIR}/cxx/utf8_util.cxx
-				${CMAKE_CURRENT_SOURCE_DIR}/cxx/locked_file.cxx)
+		${CMAKE_CURRENT_SOURCE_DIR}/cxx/file_util.cxx)
 # Rspamdutil
 SET(RSPAMD_UTIL ${LIBRSPAMDUTILSRC} PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/libutil/cxx/locked_file.cxx b/src/libutil/cxx/file_util.cxx
similarity index 99%
rename from src/libutil/cxx/locked_file.cxx
rename to src/libutil/cxx/file_util.cxx
index c972e1de3..10a91a251 100644
--- a/src/libutil/cxx/locked_file.cxx
+++ b/src/libutil/cxx/file_util.cxx
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "locked_file.hxx"
+#include "file_util.hxx"
 #include <fmt/core.h>
 #include "libutil/util.h"
 #include "libutil/unix-std.h"
diff --git a/src/libutil/cxx/locked_file.hxx b/src/libutil/cxx/file_util.hxx
similarity index 98%
rename from src/libutil/cxx/locked_file.hxx
rename to src/libutil/cxx/file_util.hxx
index 507b02762..c66fd17ef 100644
--- a/src/libutil/cxx/locked_file.hxx
+++ b/src/libutil/cxx/file_util.hxx
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef RSPAMD_LOCKED_FILE_HXX
-#define RSPAMD_LOCKED_FILE_HXX
+#ifndef RSPAMD_FILE_UTIL_HXX
+#define RSPAMD_FILE_UTIL_HXX
 #pragma once
 
 #include "config.h"
@@ -258,4 +258,4 @@ private:
 
 }
 
-#endif //RSPAMD_LOCKED_FILE_HXX
+#endif //RSPAMD_FILE_UTIL_HXX


More information about the Commits mailing list