From 98b2d50b40d247da284dc52b328ccea0ffdde4a4 Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Wed, 17 Jun 2015 22:59:04 -0700 Subject: [PATCH] Make encfs include paths consistent. --- encfs/BlockFileIO.cpp | 4 ++-- encfs/BlockNameIO.cpp | 4 ++-- encfs/BlockNameIO.h | 2 +- encfs/Cipher.cpp | 2 +- encfs/CipherFileIO.cpp | 6 +++--- encfs/CipherFileIO.h | 4 ++-- encfs/ConfigReader.cpp | 2 +- encfs/DirNode.cpp | 6 +++--- encfs/FileNode.h | 2 +- encfs/FileUtils.cpp | 10 +++++----- encfs/MACFileIO.cpp | 6 +++--- encfs/MACFileIO.h | 6 +++--- encfs/NameIO.cpp | 4 ++-- encfs/NullCipher.cpp | 2 +- encfs/NullCipher.h | 2 +- encfs/NullNameIO.cpp | 4 ++-- encfs/NullNameIO.h | 2 +- encfs/RawFileIO.cpp | 2 +- encfs/RawFileIO.h | 2 +- encfs/SSL_Cipher.cpp | 4 ++-- encfs/SSL_Cipher.h | 2 +- encfs/StreamNameIO.cpp | 4 ++-- encfs/StreamNameIO.h | 2 +- encfs/encfs.cpp | 2 +- encfs/encfsctl.cpp | 6 +++--- encfs/test.cpp | 8 ++++---- 26 files changed, 50 insertions(+), 50 deletions(-) diff --git a/encfs/BlockFileIO.cpp b/encfs/BlockFileIO.cpp index 949237d..ba9d060 100644 --- a/encfs/BlockFileIO.cpp +++ b/encfs/BlockFileIO.cpp @@ -25,10 +25,10 @@ #include #include +#include "FSConfig.h" +#include "FileIO.h" #include "FileUtils.h" #include "MemoryPool.h" -#include "encfs/FSConfig.h" -#include "encfs/FileIO.h" #include "i18n.h" template diff --git a/encfs/BlockNameIO.cpp b/encfs/BlockNameIO.cpp index 47f49e3..863d68c 100644 --- a/encfs/BlockNameIO.cpp +++ b/encfs/BlockNameIO.cpp @@ -25,9 +25,9 @@ #include #include "Cipher.h" +#include "CipherKey.h" +#include "NameIO.h" #include "base64.h" -#include "encfs/CipherKey.h" -#include "encfs/NameIO.h" #include "intl/gettext.h" namespace rlog { diff --git a/encfs/BlockNameIO.h b/encfs/BlockNameIO.h index e28c949..3f51257 100644 --- a/encfs/BlockNameIO.h +++ b/encfs/BlockNameIO.h @@ -25,8 +25,8 @@ #include #include "CipherKey.h" +#include "Interface.h" #include "NameIO.h" -#include "encfs/Interface.h" #include "shared_ptr.h" class Cipher; diff --git a/encfs/Cipher.cpp b/encfs/Cipher.cpp index e7c371a..c8e9101 100644 --- a/encfs/Cipher.cpp +++ b/encfs/Cipher.cpp @@ -26,6 +26,7 @@ #include #include "Cipher.h" +#include "CipherKey.h" #include "Interface.h" // for static build. Need to reference the modules which are registered at // run-time, to ensure that the linker doesn't optimize them away. @@ -33,7 +34,6 @@ #include "Range.h" #include "SSL_Cipher.h" #include "base64.h" -#include "encfs/CipherKey.h" using namespace std; using namespace rel; diff --git a/encfs/CipherFileIO.cpp b/encfs/CipherFileIO.cpp index 3992c05..dfbb171 100644 --- a/encfs/CipherFileIO.cpp +++ b/encfs/CipherFileIO.cpp @@ -29,10 +29,10 @@ #include #include +#include "BlockFileIO.h" #include "Cipher.h" -#include "encfs/BlockFileIO.h" -#include "encfs/CipherKey.h" -#include "encfs/FileIO.h" +#include "CipherKey.h" +#include "FileIO.h" /* - Version 2:0 adds support for a per-file initialization vector with a diff --git a/encfs/CipherFileIO.h b/encfs/CipherFileIO.h index b59f4ed..e73e6ff 100644 --- a/encfs/CipherFileIO.h +++ b/encfs/CipherFileIO.h @@ -28,9 +28,9 @@ #include "BlockFileIO.h" #include "CipherKey.h" +#include "FSConfig.h" #include "FileUtils.h" -#include "encfs/FSConfig.h" -#include "encfs/Interface.h" +#include "Interface.h" class Cipher; class FileIO; diff --git a/encfs/ConfigReader.cpp b/encfs/ConfigReader.cpp index 3402945..ee298c8 100644 --- a/encfs/ConfigReader.cpp +++ b/encfs/ConfigReader.cpp @@ -27,7 +27,7 @@ #include #include -#include "encfs/ConfigVar.h" +#include "ConfigVar.h" using namespace std; using namespace rlog; diff --git a/encfs/DirNode.cpp b/encfs/DirNode.cpp index 8e7eff4..9fec2ae 100644 --- a/encfs/DirNode.cpp +++ b/encfs/DirNode.cpp @@ -27,10 +27,10 @@ #include #include "DirNode.h" +#include "FSConfig.h" +#include "FileNode.h" #include "FileUtils.h" -#include "encfs/FSConfig.h" -#include "encfs/FileNode.h" -#include "encfs/NameIO.h" +#include "NameIO.h" #ifdef linux #include #endif diff --git a/encfs/FileNode.h b/encfs/FileNode.h index ff853c7..de2bb37 100644 --- a/encfs/FileNode.h +++ b/encfs/FileNode.h @@ -30,8 +30,8 @@ #include "CipherKey.h" #include "FileUtils.h" +#include "FSConfig.h" #include "encfs.h" -#include "encfs/FSConfig.h" class Cipher; class DirNode; diff --git a/encfs/FileUtils.cpp b/encfs/FileUtils.cpp index 15ccf4e..8b94d34 100644 --- a/encfs/FileUtils.cpp +++ b/encfs/FileUtils.cpp @@ -49,18 +49,18 @@ #include "BlockNameIO.h" #include "Cipher.h" +#include "CipherKey.h" #include "ConfigReader.h" +#include "ConfigVar.h" #include "Context.h" #include "DirNode.h" #include "FSConfig.h" #include "FileUtils.h" +#include "Interface.h" +#include "NameIO.h" +#include "Range.h" #include "autosprintf.h" #include "config.h" -#include "encfs/CipherKey.h" -#include "encfs/ConfigVar.h" -#include "encfs/Interface.h" -#include "encfs/NameIO.h" -#include "encfs/Range.h" #include "i18n.h" #include "intl/gettext.h" #include "readpassphrase.h" diff --git a/encfs/MACFileIO.cpp b/encfs/MACFileIO.cpp index 4d39367..a572150 100644 --- a/encfs/MACFileIO.cpp +++ b/encfs/MACFileIO.cpp @@ -26,11 +26,11 @@ #include #include +#include "BlockFileIO.h" +#include "Cipher.h" +#include "FileIO.h" #include "FileUtils.h" #include "MemoryPool.h" -#include "encfs/BlockFileIO.h" -#include "encfs/Cipher.h" -#include "encfs/FileIO.h" #include "i18n.h" namespace rlog { diff --git a/encfs/MACFileIO.h b/encfs/MACFileIO.h index 5c0d881..94dac83 100644 --- a/encfs/MACFileIO.h +++ b/encfs/MACFileIO.h @@ -27,9 +27,9 @@ #include "BlockFileIO.h" #include "Cipher.h" -#include "encfs/CipherKey.h" -#include "encfs/FSConfig.h" -#include "encfs/Interface.h" +#include "CipherKey.h" +#include "FSConfig.h" +#include "Interface.h" class Cipher; class FileIO; diff --git a/encfs/NameIO.cpp b/encfs/NameIO.cpp index 60b400b..682c089 100644 --- a/encfs/NameIO.cpp +++ b/encfs/NameIO.cpp @@ -30,10 +30,10 @@ #include #include "BlockNameIO.h" +#include "CipherKey.h" +#include "Interface.h" #include "NullNameIO.h" #include "StreamNameIO.h" -#include "encfs/CipherKey.h" -#include "encfs/Interface.h" using namespace std; using namespace rel; diff --git a/encfs/NullCipher.cpp b/encfs/NullCipher.cpp index a56f831..3423b54 100644 --- a/encfs/NullCipher.cpp +++ b/encfs/NullCipher.cpp @@ -23,9 +23,9 @@ #include #include +#include "Cipher.h" #include "Interface.h" #include "Range.h" -#include "encfs/Cipher.h" using namespace std; using namespace rel; diff --git a/encfs/NullCipher.h b/encfs/NullCipher.h index fab50ae..3dd63d8 100644 --- a/encfs/NullCipher.h +++ b/encfs/NullCipher.h @@ -24,8 +24,8 @@ #include #include "Cipher.h" +#include "CipherKey.h" #include "Interface.h" -#include "encfs/CipherKey.h" /* Implements Cipher interface for a pass-through mode. May be useful for diff --git a/encfs/NullNameIO.cpp b/encfs/NullNameIO.cpp index 09ce9e6..ec18a4f 100644 --- a/encfs/NullNameIO.cpp +++ b/encfs/NullNameIO.cpp @@ -23,8 +23,8 @@ #include #include -#include "encfs/CipherKey.h" -#include "encfs/NameIO.h" +#include "CipherKey.h" +#include "NameIO.h" class Cipher; diff --git a/encfs/NullNameIO.h b/encfs/NullNameIO.h index e57a8cd..5591e18 100644 --- a/encfs/NullNameIO.h +++ b/encfs/NullNameIO.h @@ -23,8 +23,8 @@ #include +#include "Interface.h" #include "NameIO.h" -#include "encfs/Interface.h" class NullNameIO : public NameIO { public: diff --git a/encfs/RawFileIO.cpp b/encfs/RawFileIO.cpp index 3d736e3..339a3f9 100644 --- a/encfs/RawFileIO.cpp +++ b/encfs/RawFileIO.cpp @@ -29,8 +29,8 @@ #include #include +#include "FileIO.h" #include "RawFileIO.h" -#include "encfs/FileIO.h" using namespace std; diff --git a/encfs/RawFileIO.h b/encfs/RawFileIO.h index d4f8eac..12b36d1 100644 --- a/encfs/RawFileIO.h +++ b/encfs/RawFileIO.h @@ -24,8 +24,8 @@ #include #include +#include "Interface.h" #include "FileIO.h" -#include "encfs/Interface.h" class RawFileIO : public FileIO { public: diff --git a/encfs/SSL_Cipher.cpp b/encfs/SSL_Cipher.cpp index 3ab5321..ebac89d 100644 --- a/encfs/SSL_Cipher.cpp +++ b/encfs/SSL_Cipher.cpp @@ -32,11 +32,11 @@ #include #include +#include "Cipher.h" +#include "Interface.h" #include "Mutex.h" #include "Range.h" #include "SSL_Cipher.h" -#include "encfs/Cipher.h" -#include "encfs/Interface.h" #include "intl/gettext.h" namespace rlog { diff --git a/encfs/SSL_Cipher.h b/encfs/SSL_Cipher.h index ba3bed2..76badc1 100644 --- a/encfs/SSL_Cipher.h +++ b/encfs/SSL_Cipher.h @@ -25,8 +25,8 @@ #include #include "Cipher.h" +#include "CipherKey.h" #include "Interface.h" -#include "encfs/CipherKey.h" class SSLKey; #ifndef EVP_CIPHER diff --git a/encfs/StreamNameIO.cpp b/encfs/StreamNameIO.cpp index 14aac4d..c111198 100644 --- a/encfs/StreamNameIO.cpp +++ b/encfs/StreamNameIO.cpp @@ -25,9 +25,9 @@ #include #include "Cipher.h" +#include "CipherKey.h" +#include "NameIO.h" #include "base64.h" -#include "encfs/CipherKey.h" -#include "encfs/NameIO.h" #include "intl/gettext.h" using namespace rel; diff --git a/encfs/StreamNameIO.h b/encfs/StreamNameIO.h index f98fd60..723fc6d 100644 --- a/encfs/StreamNameIO.h +++ b/encfs/StreamNameIO.h @@ -25,8 +25,8 @@ #include #include "CipherKey.h" +#include "Interface.h" #include "NameIO.h" -#include "encfs/Interface.h" class Cipher; diff --git a/encfs/encfs.cpp b/encfs/encfs.cpp index 389b1f7..f128834 100644 --- a/encfs/encfs.cpp +++ b/encfs/encfs.cpp @@ -49,8 +49,8 @@ #include "Context.h" #include "DirNode.h" +#include "FileNode.h" #include "FileUtils.h" -#include "encfs/FileNode.h" #include "fuse.h" namespace rel { diff --git a/encfs/encfsctl.cpp b/encfs/encfsctl.cpp index b1bfc2c..369c35b 100644 --- a/encfs/encfsctl.cpp +++ b/encfs/encfsctl.cpp @@ -36,14 +36,14 @@ #include #include "Cipher.h" +#include "CipherKey.h" #include "DirNode.h" +#include "FSConfig.h" #include "FileNode.h" #include "FileUtils.h" +#include "Interface.h" #include "autosprintf.h" #include "config.h" -#include "encfs/CipherKey.h" -#include "encfs/FSConfig.h" -#include "encfs/Interface.h" #include "i18n.h" #include "intl/gettext.h" diff --git a/encfs/test.cpp b/encfs/test.cpp index 8c7c985..6bd8f70 100644 --- a/encfs/test.cpp +++ b/encfs/test.cpp @@ -31,15 +31,15 @@ #include "BlockNameIO.h" #include "Cipher.h" +#include "CipherKey.h" #include "DirNode.h" +#include "FSConfig.h" #include "FileUtils.h" #include "Interface.h" #include "MemoryPool.h" +#include "NameIO.h" +#include "Range.h" #include "StreamNameIO.h" -#include "encfs/CipherKey.h" -#include "encfs/FSConfig.h" -#include "encfs/NameIO.h" -#include "encfs/Range.h" #define NO_DES #include