Unify (and fix) include guards

fs_interface/Device.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_DEVICE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_DEVICE_H_
-#define FSPP_DEVICE_H_
+#define MESSMER_FSPP_FSINTERFACE_DEVICE_H_
 
 #include <boost/filesystem.hpp>
 #include <messmer/cpp-utils/pointer/unique_ref.h>

fs_interface/Dir.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_DIR_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_DIR_H_
-#define FSPP_DIR_H_
+#define MESSMER_FSPP_FSINTERFACE_DIR_H_
 
 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>

fs_interface/File.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FILE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_FILE_H_
-#define FSPP_FILE_H_
+#define MESSMER_FSPP_FSINTERFACE_FILE_H_
 
 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>

fs_interface/Node.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_NODE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_NODE_H_
-#define FSPP_NODE_H_
+#define MESSMER_FSPP_FSINTERFACE_NODE_H_
 
 #include <boost/filesystem.hpp>
 

fs_interface/OpenFile.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_OPENFILE_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_OPENFILE_H_
-#define FSPP_OPENFILE_H_
+#define MESSMER_FSPP_FSINTERFACE_OPENFILE_H_
 
 #include <boost/filesystem.hpp>
 #include <sys/stat.h>

fs_interface/Symlink.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_SYMLINK_H_
+#ifndef MESSMER_FSPP_FSINTERFACE_SYMLINK_H_
-#define FSPP_SYMLINK_H_
+#define MESSMER_FSPP_FSINTERFACE_SYMLINK_H_
 
 #include "Node.h"
 #include <messmer/cpp-utils/pointer/unique_ref.h>

fstest/FsTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSTEST_H_
 #define MESSMER_FSPP_FSTEST_FSTEST_H_
 

fstest/FsppDeviceTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDEVICETEST_H_
 

fstest/FsppDirTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPDIRTEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPDIRTEST_H_
 

fstest/FsppFileTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPFILETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPFILETEST_H_
 

fstest/FsppOpenFileTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_FSPPOPENFILETEST_H_
 #define MESSMER_FSPP_FSTEST_FSPPOPENFILETEST_H_
 

fstest/testutils/FileSystemTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILESYSTEMTEST_H_
 

fstest/testutils/FileTest.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_
 #define MESSMER_FSPP_FSTEST_TESTUTILS_FILETEST_H_
 

fuse/Filesystem.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FILESYSTEM_H_
+#ifndef MESSMER_FSPP_FUSE_FILESYSTEM_H_
-#define FSPP_IMPL_FILESYSTEM_H_
+#define MESSMER_FSPP_FUSE_FILESYSTEM_H_
 
 #include <boost/filesystem.hpp>
 #include <messmer/cpp-utils/pointer/unique_ref.h>

fuse/Fuse.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_FUSE_H_
+#ifndef MESSMER_FSPP_FUSE_FUSE_H_
-#define FSPP_FUSE_FUSE_H_
+#define MESSMER_FSPP_FUSE_FUSE_H_
 
 #include "params.h"
 #include <cstdio>

fuse/FuseErrnoException.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_FUSEERRNOEXCEPTION_H_
+#ifndef MESSMER_FSPP_FUSE_FUSEERRNOEXCEPTION_H_
-#define FSPP_FUSE_FUSEERRNOEXCEPTION_H_
+#define MESSMER_FSPP_FUSE_FUSEERRNOEXCEPTION_H_
 
 #include <stdexcept>
 #include <errno.h>

fuse/params.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_PARAMS_H_
+#ifndef MESSMER_FSPP_FUSE_PARAMS_H_
-#define FSPP_FUSE_PARAMS_H_
+#define MESSMER_FSPP_FUSE_PARAMS_H_
 
 #define FUSE_USE_VERSION 26
 #include <fuse.h>

impl/FilesystemImpl.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FILESYSTEMIMPL_H_
+#ifndef MESSMER_FSPP_IMPL_FILESYSTEMIMPL_H_
-#define FSPP_IMPL_FILESYSTEMIMPL_H_
+#define MESSMER_FSPP_IMPL_FILESYSTEMIMPL_H_
 
 #include "FuseOpenFileList.h"
 #include "../fuse/Filesystem.h"

impl/FuseOpenFileList.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_IMPL_FUSEOPENFILELIST_H_
+#ifndef MESSMER_FSPP_IMPL_FUSEOPENFILELIST_H_
-#define FSPP_IMPL_FUSEOPENFILELIST_H_
+#define MESSMER_FSPP_IMPL_FUSEOPENFILELIST_H_
 
 #include "../fs_interface/File.h"
 #include "../fs_interface/OpenFile.h"

impl/IdList.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FSPP_FUSE_IDLIST_H_
+#ifndef MESSMER_FSPP_IMPL_IDLIST_H_
-#define FSPP_FUSE_IDLIST_H_
+#define MESSMER_FSPP_IMPL_IDLIST_H_
 
 #include <map>
 #include <mutex>

impl/Profiler.h

@@ -1,5 +1,6 @@
-#ifndef FSPP_IMPL_PROFILER_H
+#pragma once
-#define FSPP_IMPL_PROFILER_H
+#ifndef MESSMER_FSPP_IMPL_PROFILER_H
+#define MESSMER_FSPP_IMPL_PROFILER_H
 
 #include <atomic>
 #include <chrono>

test/fuse/access/testutils/FuseAccessTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
-#define TEST_FSPP_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_ACCESS_TESTUTILS_FUSEACCESSTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/createAndOpenFile/testutils/FuseCreateAndOpenTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
-#define TEST_FSPP_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_CREATEANDOPENFILE_TESTUTILS_FUSECREATEANDOPENTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/fdatasync/testutils/FuseFdatasyncTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
-#define TEST_FSPP_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FDATASYNC_TESTUTILS_FUSEFDATASYNCTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/flush/testutils/FuseFlushTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
-#define TEST_FSPP_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FLUSH_TESTUTILS_FUSEFLUSHTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/fstat/testutils/FuseFstatTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
-#define TEST_FSPP_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FSTAT_TESTUTILS_FUSEFSTATTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/fsync/testutils/FuseFsyncTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
-#define TEST_FSPP_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FSYNC_TESTUTILS_FUSEFSYNCTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/ftruncate/testutils/FuseFTruncateTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
-#define TEST_FSPP_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_FTRUNCATE_TESTUTILS_FUSEFTRUNCATETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/lstat/testutils/FuseLstatReturnTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATRETURNTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATRETURNTEST_H_
-#define TEST_FSPP_FUSE_LSTAT_FUSELSTATRETURNTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATRETURNTEST_H_
 
 #include "FuseLstatTest.h"
 

test/fuse/lstat/testutils/FuseLstatTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATTEST_H_
-#define TEST_FSPP_FUSE_LSTAT_FUSELSTATTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_LSTAT_TESTUTILS_FUSELSTATTEST_H_
 
 #include <string>
 #include <functional>

test/fuse/mkdir/testutils/FuseMkdirTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
-#define TEST_FSPP_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_MKDIR_TESTUTILS_FUSEMKDIRTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/openFile/testutils/FuseOpenTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
-#define TEST_FSPP_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_OPENFILE_TESTUTILS_FUSEOPENTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/read/testutils/FuseReadTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
-#define TEST_FSPP_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_READ_TESTUTILS_FUSEREADTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/readDir/testutils/FuseReadDirTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
-#define TEST_FSPP_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_READDIR_TESTUTILS_FUSEREADDIRTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 #include <dirent.h>

test/fuse/rename/testutils/FuseRenameTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
-#define TEST_FSPP_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_RENAME_TESTUTILS_FUSERENAMETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/rmdir/testutils/FuseRmdirTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
-#define TEST_FSPP_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_RMDIR_TESTUTILS_FUSERMDIRTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/statfs/testutils/FuseStatfsReturnTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_STATFS_FUSESTATFSRETURNTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSRETURNTEST_H_
-#define TEST_FSPP_FUSE_STATFS_FUSESTATFSRETURNTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSRETURNTEST_H_
 
 #include "FuseStatfsTest.h"
 

test/fuse/statfs/testutils/FuseStatfsTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_STATFS_FUSESTATFSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSTEST_H_
-#define TEST_FSPP_FUSE_STATFS_FUSESTATFSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_STATFS_TESTUTILS_FUSESTATFSTEST_H_
 
 #include <string>
 #include <functional>

test/fuse/truncate/testutils/FuseTruncateTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
-#define TEST_FSPP_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_TRUNCATE_TESTUTILS_FUSETRUNCATETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/unlink/testutils/FuseUnlinkTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
-#define TEST_FSPP_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_UNLINK_TESTUTILS_FUSEUNLINKTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/utimens/testutils/FuseUtimensTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
-#define TEST_FSPP_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
+#define MESSMER_FSPP_TEST_FUSE_UTIMENS_TESTUTILS_FUSEUTIMENSTEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/fuse/write/testutils/FuseWriteTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_FSPP_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
+#ifndef MESSMER_FSPP_TEST_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
-#define TEST_FSPP_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
+#define MESSMER_FSPP_TEST_FUSE_WRITE_TESTUTILS_FUSEWRITETEST_H_
 
 #include "../../../testutils/FuseTest.h"
 

test/testutils/FuseTest.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_TESTUTILS_FUSETEST_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
-#define TEST_TESTUTILS_FUSETEST_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_FUSETEST_H_
 
 #include "google/gtest/gtest.h"
 #include "google/gmock/gmock.h"

test/testutils/FuseThread.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef TEST_TESTUTILS_FUSETHREAD_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_FUSETHREAD_H_
-#define TEST_TESTUTILS_FUSETHREAD_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_FUSETHREAD_H_
 
 #include <thread>
 

test/testutils/InMemoryFile.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef BLOCKS_MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
+#ifndef MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
-#define BLOCKS_MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
+#define MESSMER_FSPP_TEST_TESTUTILS_INMEMORYFILE_H_
 
 #include <messmer/cpp-utils/data/Data.h>