From 9022e1fac478e545f19a577135bd991d641f69c4 Mon Sep 17 00:00:00 2001 From: Vladimir Stackov Date: Sun, 25 Jan 2015 19:44:15 +0300 Subject: [PATCH] Drop leading/trailing underscores in the header guards --- adler32.hh | 4 ++-- appendallocator.hh | 4 ++-- backup_collector.hh | 4 ++-- backup_creator.hh | 4 ++-- backup_exchanger.hh | 4 ++-- backup_file.hh | 4 ++-- backup_restorer.hh | 4 ++-- bundle.hh | 4 ++-- check.hh | 4 ++-- chunk_id.hh | 4 ++-- chunk_index.hh | 4 ++-- chunk_storage.hh | 4 ++-- compression.hh | 4 ++-- config.hh | 4 ++-- debug.hh | 4 ++-- dir.hh | 4 ++-- encrypted_file.hh | 4 ++-- encryption.hh | 4 ++-- encryption_key.hh | 4 ++-- endian.hh | 4 ++-- ex.hh | 4 ++-- file.hh | 4 ++-- hex.hh | 4 ++-- index_file.hh | 4 ++-- message.hh | 4 ++-- mt.hh | 4 ++-- nocopy.hh | 4 ++-- objectcache.hh | 4 ++-- page_size.hh | 4 ++-- random.hh | 4 ++-- rolling_hash.hh | 4 ++-- sha256.hh | 4 ++-- sptr.hh | 4 ++-- static_assert.hh | 4 ++-- storage_info_file.hh | 4 ++-- tmp_mgr.hh | 4 ++-- unbuffered_file.hh | 4 ++-- utils.hh | 4 ++-- zbackup.hh | 4 ++-- zbackup_base.cc | 12 ++++++------ zbackup_base.hh | 4 ++-- 41 files changed, 86 insertions(+), 86 deletions(-) diff --git a/adler32.hh b/adler32.hh index 62404b1..6211c46 100644 --- a/adler32.hh +++ b/adler32.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ADLER32_HH_INCLUDED__ -#define ADLER32_HH_INCLUDED__ +#ifndef ADLER32_HH_INCLUDED +#define ADLER32_HH_INCLUDED #include #include diff --git a/appendallocator.hh b/appendallocator.hh index 9429c7f..0f0ed47 100644 --- a/appendallocator.hh +++ b/appendallocator.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef APPENDALLOCATOR_HH_INCLUDED__ -#define APPENDALLOCATOR_HH_INCLUDED__ +#ifndef APPENDALLOCATOR_HH_INCLUDED +#define APPENDALLOCATOR_HH_INCLUDED #include #include diff --git a/backup_collector.hh b/backup_collector.hh index e1716ff..6ac27a2 100644 --- a/backup_collector.hh +++ b/backup_collector.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef BACKUP_COLLECTOR_HH_INCLUDED__ -#define BACKUP_COLLECTOR_HH_INCLUDED__ +#ifndef BACKUP_COLLECTOR_HH_INCLUDED +#define BACKUP_COLLECTOR_HH_INCLUDED #include "zbackup_base.hh" #include "chunk_storage.hh" diff --git a/backup_creator.hh b/backup_creator.hh index 44d2558..2146ec7 100644 --- a/backup_creator.hh +++ b/backup_creator.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef BACKUP_CREATOR_HH_INCLUDED__ -#define BACKUP_CREATOR_HH_INCLUDED__ +#ifndef BACKUP_CREATOR_HH_INCLUDED +#define BACKUP_CREATOR_HH_INCLUDED #include #include diff --git a/backup_exchanger.hh b/backup_exchanger.hh index d2f0229..457c48f 100644 --- a/backup_exchanger.hh +++ b/backup_exchanger.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef BACKUP_EXCHANGER_HH_INCLUDED__ -#define BACKUP_EXCHANGER_HH_INCLUDED__ +#ifndef BACKUP_EXCHANGER_HH_INCLUDED +#define BACKUP_EXCHANGER_HH_INCLUDED #include #include diff --git a/backup_file.hh b/backup_file.hh index 2fb21a0..26b7c73 100644 --- a/backup_file.hh +++ b/backup_file.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef BACKUP_FILE_HH_INCLUDED__ -#define BACKUP_FILE_HH_INCLUDED__ +#ifndef BACKUP_FILE_HH_INCLUDED +#define BACKUP_FILE_HH_INCLUDED #include #include diff --git a/backup_restorer.hh b/backup_restorer.hh index e0ab2f7..9e4d61f 100644 --- a/backup_restorer.hh +++ b/backup_restorer.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef BACKUP_RESTORER_HH_INCLUDED__ -#define BACKUP_RESTORER_HH_INCLUDED__ +#ifndef BACKUP_RESTORER_HH_INCLUDED +#define BACKUP_RESTORER_HH_INCLUDED #include #include diff --git a/bundle.hh b/bundle.hh index c95cc2e..c03b968 100644 --- a/bundle.hh +++ b/bundle.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef BUNDLE_HH_INCLUDED__ -#define BUNDLE_HH_INCLUDED__ +#ifndef BUNDLE_HH_INCLUDED +#define BUNDLE_HH_INCLUDED #include #include diff --git a/check.hh b/check.hh index c6109bd..be5efff 100644 --- a/check.hh +++ b/check.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef CHECK_HH_INCLUDED__ -#define CHECK_HH_INCLUDED__ +#ifndef CHECK_HH_INCLUDED +#define CHECK_HH_INCLUDED #include #include diff --git a/chunk_id.hh b/chunk_id.hh index 34f09b7..aee12c3 100644 --- a/chunk_id.hh +++ b/chunk_id.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef CHUNK_ID_HH_INCLUDED__ -#define CHUNK_ID_HH_INCLUDED__ +#ifndef CHUNK_ID_HH_INCLUDED +#define CHUNK_ID_HH_INCLUDED #include #include "rolling_hash.hh" diff --git a/chunk_index.hh b/chunk_index.hh index 0ce1646..bd34a18 100644 --- a/chunk_index.hh +++ b/chunk_index.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef CHUNK_INDEX_HH_INCLUDED__ -#define CHUNK_INDEX_HH_INCLUDED__ +#ifndef CHUNK_INDEX_HH_INCLUDED +#define CHUNK_INDEX_HH_INCLUDED // is obsolete, but requires C++11. Make up your // mind, GNU people! diff --git a/chunk_storage.hh b/chunk_storage.hh index 742c2a6..ac76f37 100644 --- a/chunk_storage.hh +++ b/chunk_storage.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef CHUNK_STORAGE_HH_INCLUDED__ -#define CHUNK_STORAGE_HH_INCLUDED__ +#ifndef CHUNK_STORAGE_HH_INCLUDED +#define CHUNK_STORAGE_HH_INCLUDED #include #include diff --git a/compression.hh b/compression.hh index 13c9d3b..5f63578 100644 --- a/compression.hh +++ b/compression.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef COMPRESSION_HH_INCLUDED__ -#define COMPRESSION_HH_INCLUDED__ +#ifndef COMPRESSION_HH_INCLUDED +#define COMPRESSION_HH_INCLUDED #include "sptr.hh" #include "ex.hh" diff --git a/config.hh b/config.hh index 95cd213..8078203 100644 --- a/config.hh +++ b/config.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef CONFIG_HH_INCLUDED__ -#define CONFIG_HH_INCLUDED__ +#ifndef CONFIG_HH_INCLUDED +#define CONFIG_HH_INCLUDED #include #include diff --git a/debug.hh b/debug.hh index 5989d2d..7469911 100644 --- a/debug.hh +++ b/debug.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef DEBUG_HH_INCLUDED__ -#define DEBUG_HH_INCLUDED__ +#ifndef DEBUG_HH_INCLUDED +#define DEBUG_HH_INCLUDED #include #include diff --git a/dir.hh b/dir.hh index a07b15c..68fda38 100644 --- a/dir.hh +++ b/dir.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef DIR_HH_INCLUDED__ -#define DIR_HH_INCLUDED__ +#ifndef DIR_HH_INCLUDED +#define DIR_HH_INCLUDED #include #include diff --git a/encrypted_file.hh b/encrypted_file.hh index 1be5488..ce0c7ec 100644 --- a/encrypted_file.hh +++ b/encrypted_file.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ENCRYPTED_FILE_HH_INCLUDED__ -#define ENCRYPTED_FILE_HH_INCLUDED__ +#ifndef ENCRYPTED_FILE_HH_INCLUDED +#define ENCRYPTED_FILE_HH_INCLUDED #include #include diff --git a/encryption.hh b/encryption.hh index 6d8a384..1055fe9 100644 --- a/encryption.hh +++ b/encryption.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ENCRYPTION_HH_INCLUDED__ -#define ENCRYPTION_HH_INCLUDED__ +#ifndef ENCRYPTION_HH_INCLUDED +#define ENCRYPTION_HH_INCLUDED #include #include diff --git a/encryption_key.hh b/encryption_key.hh index f90982d..4835ab0 100644 --- a/encryption_key.hh +++ b/encryption_key.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ENCRYPTION_KEY_HH_INCLUDED__ -#define ENCRYPTION_KEY_HH_INCLUDED__ +#ifndef ENCRYPTION_KEY_HH_INCLUDED +#define ENCRYPTION_KEY_HH_INCLUDED #include #include diff --git a/endian.hh b/endian.hh index 612573b..03d869d 100644 --- a/endian.hh +++ b/endian.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ENDIAN_HH_INCLUDED__ -#define ENDIAN_HH_INCLUDED__ +#ifndef ENDIAN_HH_INCLUDED +#define ENDIAN_HH_INCLUDED #include #include diff --git a/ex.hh b/ex.hh index 0c19daa..bea7442 100644 --- a/ex.hh +++ b/ex.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef EX_HH_INCLUDED__ -#define EX_HH_INCLUDED__ +#ifndef EX_HH_INCLUDED +#define EX_HH_INCLUDED #include #include diff --git a/file.hh b/file.hh index c570f13..4e6eba8 100644 --- a/file.hh +++ b/file.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef FILE_HH_INCLUDED__ -#define FILE_HH_INCLUDED__ +#ifndef FILE_HH_INCLUDED +#define FILE_HH_INCLUDED #include #include diff --git a/hex.hh b/hex.hh index bb189e7..62d3867 100644 --- a/hex.hh +++ b/hex.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef HEX_HH_INCLUDED__ -#define HEX_HH_INCLUDED__ +#ifndef HEX_HH_INCLUDED +#define HEX_HH_INCLUDED #include diff --git a/index_file.hh b/index_file.hh index f4de11d..8be1fa0 100644 --- a/index_file.hh +++ b/index_file.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef INDEX_FILE_HH_INCLUDED__ -#define INDEX_FILE_HH_INCLUDED__ +#ifndef INDEX_FILE_HH_INCLUDED +#define INDEX_FILE_HH_INCLUDED #include #include diff --git a/message.hh b/message.hh index 07ada2f..e6704e2 100644 --- a/message.hh +++ b/message.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef MESSAGE_HH_INCLUDED__ -#define MESSAGE_HH_INCLUDED__ +#ifndef MESSAGE_HH_INCLUDED +#define MESSAGE_HH_INCLUDED #include #include diff --git a/mt.hh b/mt.hh index 7745134..9459468 100644 --- a/mt.hh +++ b/mt.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef MT_HH_INCLUDED__ -#define MT_HH_INCLUDED__ +#ifndef MT_HH_INCLUDED +#define MT_HH_INCLUDED #include #include diff --git a/nocopy.hh b/nocopy.hh index 1bc4a68..0a6f5b0 100644 --- a/nocopy.hh +++ b/nocopy.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef NOCOPY_HH_INCLUDED__ -#define NOCOPY_HH_INCLUDED__ +#ifndef NOCOPY_HH_INCLUDED +#define NOCOPY_HH_INCLUDED /// A simple class to disallow copying of the class objects. Inherit from it to /// use it diff --git a/objectcache.hh b/objectcache.hh index 5996a38..ff6bcbc 100644 --- a/objectcache.hh +++ b/objectcache.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef OBJECTCACHE_HH_INCLUDED__ -#define OBJECTCACHE_HH_INCLUDED__ +#ifndef OBJECTCACHE_HH_INCLUDED +#define OBJECTCACHE_HH_INCLUDED #include #include diff --git a/page_size.hh b/page_size.hh index db2bb44..31f18ed 100644 --- a/page_size.hh +++ b/page_size.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef PAGE_SIZE_HH_INCLUDED__ -#define PAGE_SIZE_HH_INCLUDED__ +#ifndef PAGE_SIZE_HH_INCLUDED +#define PAGE_SIZE_HH_INCLUDED /// Returns the page size used by this system unsigned getPageSize(); diff --git a/random.hh b/random.hh index 0243f9e..d2a8513 100644 --- a/random.hh +++ b/random.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef RANDOM_HH_INCLUDED__ -#define RANDOM_HH_INCLUDED__ +#ifndef RANDOM_HH_INCLUDED +#define RANDOM_HH_INCLUDED #include diff --git a/rolling_hash.hh b/rolling_hash.hh index a31c3ef..1ac357a 100644 --- a/rolling_hash.hh +++ b/rolling_hash.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ROLLING_HASH_HH_INCLUDED__ -#define ROLLING_HASH_HH_INCLUDED__ +#ifndef ROLLING_HASH_HH_INCLUDED +#define ROLLING_HASH_HH_INCLUDED #include #include diff --git a/sha256.hh b/sha256.hh index ddcca69..a3df4c2 100644 --- a/sha256.hh +++ b/sha256.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef SHA256_HH_INCLUDED__ -#define SHA256_HH_INCLUDED__ +#ifndef SHA256_HH_INCLUDED +#define SHA256_HH_INCLUDED #include #include diff --git a/sptr.hh b/sptr.hh index 1402f95..6e15b44 100644 --- a/sptr.hh +++ b/sptr.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef SPTR_HH_INCLUDED__ -#define SPTR_HH_INCLUDED__ +#ifndef SPTR_HH_INCLUDED +#define SPTR_HH_INCLUDED /// A generic non-intrusive smart-pointer template. We could use boost::, tr1:: /// or whatever, but since there's no standard solution yet, it isn't worth diff --git a/static_assert.hh b/static_assert.hh index b479706..77f08ed 100644 --- a/static_assert.hh +++ b/static_assert.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef STATIC_ASSERT_HH_INCLUDED__ -#define STATIC_ASSERT_HH_INCLUDED__ +#ifndef STATIC_ASSERT_HH_INCLUDED +#define STATIC_ASSERT_HH_INCLUDED // Based on the one from the Boost library. It wouldn't make sense to depend on // boost just for that diff --git a/storage_info_file.hh b/storage_info_file.hh index b1eefe3..d068144 100644 --- a/storage_info_file.hh +++ b/storage_info_file.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef STORAGE_INFO_FILE_HH_INCLUDED__ -#define STORAGE_INFO_FILE_HH_INCLUDED__ +#ifndef STORAGE_INFO_FILE_HH_INCLUDED +#define STORAGE_INFO_FILE_HH_INCLUDED #include #include diff --git a/tmp_mgr.hh b/tmp_mgr.hh index c6496f8..8d6fe26 100644 --- a/tmp_mgr.hh +++ b/tmp_mgr.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef TMP_MGR_HH_INCLUDED__ -#define TMP_MGR_HH_INCLUDED__ +#ifndef TMP_MGR_HH_INCLUDED +#define TMP_MGR_HH_INCLUDED #include #include diff --git a/unbuffered_file.hh b/unbuffered_file.hh index e555f8a..0feb367 100644 --- a/unbuffered_file.hh +++ b/unbuffered_file.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef UNBUFFERED_FILE_HH_INCLUDED__ -#define UNBUFFERED_FILE_HH_INCLUDED__ +#ifndef UNBUFFERED_FILE_HH_INCLUDED +#define UNBUFFERED_FILE_HH_INCLUDED #include #include diff --git a/utils.hh b/utils.hh index 8927af5..7bc87a3 100644 --- a/utils.hh +++ b/utils.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef UTILS_HH_INCLUDED__ -#define UTILS_HH_INCLUDED__ +#ifndef UTILS_HH_INCLUDED +#define UTILS_HH_INCLUDED #include diff --git a/zbackup.hh b/zbackup.hh index 6596a46..f6836ac 100644 --- a/zbackup.hh +++ b/zbackup.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ZBACKUP_HH_INCLUDED__ -#define ZBACKUP_HH_INCLUDED__ +#ifndef ZBACKUP_HH_INCLUDED +#define ZBACKUP_HH_INCLUDED #include "chunk_storage.hh" #include "zbackup_base.hh" diff --git a/zbackup_base.cc b/zbackup_base.cc index 0bc2fad..5cf1aca 100644 --- a/zbackup_base.cc +++ b/zbackup_base.cc @@ -11,14 +11,14 @@ #include "debug.hh" // TODO: make configurable by cmake -#if defined(_PATH_VI) -# define EDITOR _PATH_VI +#if defined(PATH_VI) +# define EDITOR PATH_VI #else # define EDITOR "/bin/vi" #endif -#ifndef _PATH_BSHELL -# define _PATH_BSHELL "/bin/sh" +#ifndef PATH_BSHELL +# define PATH_BSHELL "/bin/sh" #endif using std::string; @@ -318,9 +318,9 @@ fatal: goto fatal; case 0: /* child */ - dPrintf( "Spawning editor: %s %s %s %s\n", _PATH_BSHELL, _PATH_BSHELL, + dPrintf( "Spawning editor: %s %s %s %s\n", PATH_BSHELL, PATH_BSHELL, "-c", shellArgs.c_str() ); - execlp( _PATH_BSHELL, _PATH_BSHELL, "-c", shellArgs.c_str(), (char *) 0 ); + execlp( PATH_BSHELL, PATH_BSHELL, "-c", shellArgs.c_str(), (char *) 0 ); perror( editor.c_str() ); exit( EXIT_FAILURE ); /*NOTREACHED*/ diff --git a/zbackup_base.hh b/zbackup_base.hh index 95b437c..96a9f08 100644 --- a/zbackup_base.hh +++ b/zbackup_base.hh @@ -1,8 +1,8 @@ // Copyright (c) 2012-2014 Konstantin Isakov and ZBackup contributors, see CONTRIBUTORS // Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE -#ifndef ZBACKUP_BASE_HH_INCLUDED__ -#define ZBACKUP_BASE_HH_INCLUDED__ +#ifndef ZBACKUP_BASE_HH_INCLUDED +#define ZBACKUP_BASE_HH_INCLUDED #include #include