Unify (and fix) include guards

src/config/CryCipher.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_CRYCIPHER_H
+#pragma once
-#define CRYFS_CRYCIPHER_H
+#ifndef MESSMER_CRYFS_SRC_CONFIG_CRYCIPHER_H
+#define MESSMER_CRYFS_SRC_CONFIG_CRYCIPHER_H
 
 #include <vector>
 #include <string>

src/config/CryConfig.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYCONFIG_H_
+#ifndef MESSMER_CRYFS_SRC_CONFIG_CRYCONFIG_H_
-#define CRYFS_LIB_CRYCONFIG_H_
+#define MESSMER_CRYFS_SRC_CONFIG_CRYCONFIG_H_
 
 #include <boost/filesystem/path.hpp>
 

src/config/CryConfigLoader.h

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

src/filesystem/CryDevice.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYDEVICE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYDEVICE_H_
-#define CRYFS_LIB_CRYDEVICE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYDEVICE_H_
 
 #include <messmer/blockstore/interface/BlockStore.h>
 #include "../config/CryConfigLoader.h"

src/filesystem/CryDir.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYDIR_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYDIR_H_
-#define CRYFS_LIB_CRYDIR_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYDIR_H_
 
 #include <messmer/fspp/fs_interface/Dir.h>
 #include "CryNode.h"

src/filesystem/CryFile.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYFILE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_
-#define CRYFS_LIB_CRYFILE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYFILE_H_
 
 #include "parallelaccessfsblobstore/FileBlobRef.h"
 #include "parallelaccessfsblobstore/DirBlobRef.h"

src/filesystem/CryNode.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYNODE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYNODE_H_
-#define CRYFS_LIB_CRYNODE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYNODE_H_
 
 #include <messmer/fspp/fs_interface/Node.h>
 #include "messmer/cpp-utils/macros.h"

src/filesystem/CryOpenFile.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYOPENFILE_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYOPENFILE_H_
-#define CRYFS_LIB_CRYOPENFILE_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYOPENFILE_H_
 
 #include "messmer/fspp/fs_interface/OpenFile.h"
 #include "parallelaccessfsblobstore/FileBlobRef.h"

src/filesystem/CrySymlink.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_LIB_CRYSYMLINK_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_CRYSYMLINK_H_
-#define CRYFS_LIB_CRYSYMLINK_H_
+#define MESSMER_CRYFS_FILESYSTEM_CRYSYMLINK_H_
 
 #include <messmer/fspp/fs_interface/Symlink.h>
 #include "CryNode.h"

src/filesystem/cachingfsblobstore/CachingFsBlobStore.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
+#pragma once
-#define CRYFS_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_CACHINGFSBLOBSTORE_H
 
 #include <messmer/cpp-utils/pointer/unique_ref.h>
 #include "../fsblobstore/FsBlobStore.h"

src/filesystem/cachingfsblobstore/DirBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
+#pragma once
-#define CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_DIRBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../fsblobstore/DirBlob.h"

src/filesystem/cachingfsblobstore/FileBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
+#pragma once
-#define CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FILEBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../fsblobstore/FileBlob.h"

src/filesystem/cachingfsblobstore/FsBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_CACHINGFSBLOBSTORE_FSBLOBREF_H
+#pragma once
-#define CRYFS_CACHINGFSBLOBSTORE_FSBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_FSBLOBREF_H
 
 #include "../fsblobstore/FsBlob.h"
 

src/filesystem/cachingfsblobstore/SymlinkBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
+#pragma once
-#define CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_CACHINGFSBLOBSTORE_SYMLINKBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../fsblobstore/SymlinkBlob.h"

src/filesystem/fsblobstore/DirBlob.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_DIRBLOB_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_DIRBLOB_H_
-#define CRYFS_FSBLOBSTORE_DIRBLOB_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_DIRBLOB_H_
 
 #include <messmer/blockstore/utils/Key.h>
 #include <messmer/cpp-utils/macros.h>

src/filesystem/fsblobstore/FileBlob.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_FILEBLOB_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FILEBLOB_H_
-#define CRYFS_FSBLOBSTORE_FILEBLOB_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FILEBLOB_H_
 
 #include "FsBlob.h"
 

src/filesystem/fsblobstore/FsBlob.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FSBLOBSTORE_FSBLOB_H
+#pragma once
-#define CRYFS_FSBLOBSTORE_FSBLOB_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOB_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOB_H
 
 #include <messmer/cpp-utils/pointer/unique_ref.h>
 #include <messmer/blobstore/interface/Blob.h>

src/filesystem/fsblobstore/FsBlobStore.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FSBLOBSTORE_FSBLOBSTORE_H
+#pragma once
-#define CRYFS_FSBLOBSTORE_FSBLOBSTORE_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOBSTORE_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_FSBLOBSTORE_H
 
 #include <messmer/cpp-utils/lock/LockPool.h>
 #include <messmer/cpp-utils/pointer/unique_ref.h>

src/filesystem/fsblobstore/MagicNumbers.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_MAGICNUMBERS_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_MAGICNUMBERS_H_
-#define CRYFS_FSBLOBSTORE_MAGICNUMBERS_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_MAGICNUMBERS_H_
 
 namespace cryfs {
 namespace fsblobstore {

src/filesystem/fsblobstore/SymlinkBlob.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FSBLOBSTORE_SYMLINKBLOB_H_
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_SYMLINKBLOB_H_
-#define CRYFS_FSBLOBSTORE_SYMLINKBLOB_H_
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_SYMLINKBLOB_H_
 
 #include <boost/filesystem/path.hpp>
 #include "FsBlob.h"

src/filesystem/fsblobstore/utils/DirEntry.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
-#define CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRY_H
 
 #include <messmer/blockstore/utils/Key.h>
 #include <messmer/fspp/fs_interface/Dir.h>

src/filesystem/fsblobstore/utils/DirEntryList.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
-#define CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
+#define MESSMER_CRYFS_FILESYSTEM_FSBLOBSTORE_UTILS_DIRENTRYLIST_H
 
 #include <messmer/cpp-utils/data/Data.h>
 #include "DirEntry.h"

src/filesystem/parallelaccessfsblobstore/DirBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
+#pragma once
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_DIRBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../cachingfsblobstore/DirBlobRef.h"

src/filesystem/parallelaccessfsblobstore/FileBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
+#pragma once
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FILEBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../cachingfsblobstore/FileBlobRef.h"

src/filesystem/parallelaccessfsblobstore/FsBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
+#pragma once
-#define CRYFS_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_FSBLOBREF_H
 
 #include <messmer/parallelaccessstore/ParallelAccessStore.h>
 #include "../cachingfsblobstore/FsBlobRef.h"

src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStore.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
+#pragma once
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_PARALLELACCESSFSBLOBSTORE_H
 
 #include <messmer/parallelaccessstore/ParallelAccessStore.h>
 #include "FileBlobRef.h"

src/filesystem/parallelaccessfsblobstore/ParallelAccessFsBlobStoreAdapter.h

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

src/filesystem/parallelaccessfsblobstore/SymlinkBlobRef.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
+#pragma once
-#define CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
+#ifndef MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
+#define MESSMER_CRYFS_FILESYSTEM_PARALLELACCESSFSBLOBSTORE_SYMLINKBLOBREF_H
 
 #include "FsBlobRef.h"
 #include "../cachingfsblobstore/SymlinkBlobRef.h"

src/main.cpp

@@ -1,4 +1,4 @@
-#include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h>
+ß#include <messmer/blockstore/implementations/ondisk/OnDiskBlockStore.h>
 #include <messmer/blockstore/implementations/inmemory/InMemoryBlockStore.h>
 #include <messmer/blockstore/implementations/inmemory/InMemoryBlock.h>
 #include <cmath>

src/program_options/Parser.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_PROGRAMOPTIONS_PARSER_H
+#pragma once
-#define CRYFS_PROGRAMOPTIONS_PARSER_H
+#ifndef MESSMER_CRYFS_PROGRAMOPTIONS_PARSER_H
+#define MESSMER_CRYFS_PROGRAMOPTIONS_PARSER_H
 
 #include "ProgramOptions.h"
 #include <boost/program_options.hpp>

src/program_options/ProgramOptions.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
+#pragma once
-#define CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
+#ifndef MESSMER_CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
+#define MESSMER_CRYFS_PROGRAMOPTIONS_PROGRAMOPTIONS_H
 
 #include <vector>
 #include <string>

src/program_options/utils.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_PROGRAMOPTIONS_UTILS_H
+#pragma once
-#define CRYFS_PROGRAMOPTIONS_UTILS_H
+#ifndef MESSMER_CRYFS_PROGRAMOPTIONS_UTILS_H
+#define MESSMER_CRYFS_PROGRAMOPTIONS_UTILS_H
 
 #include <utility>
 #include <vector>

test/program_options/testutils/ProgramOptionsTestBase.h

@@ -1,5 +1,6 @@
-#ifndef CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
+#pragma once
-#define CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
+#ifndef MESSMER_CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
+#define MESSMER_CRYFS_TEST_PROGRAMOPTIONS_PROGRAMOPTIONSTEST_H
 
 #include <google/gtest/gtest.h>