Skip to content

Refactor header guards to use consistent naming conventions across multiple header files. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ViralTaco wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor header guards to use consistent naming conventions across multiple header files. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions common/RequestHandler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __REQUEST_HANDLER__
#define __REQUEST_HANDLER__
#ifndef RequestHandler_hpp
#define RequestHandler_hpp

#include <iostream>
#include <memory>
Expand All @@ -24,4 +24,4 @@ class RequestHandler
void post_process(boost::property_tree::ptree& response);
};

#endif //__REQUEST_HANDLER__
#endif //RequestHandler_hpp
4 changes: 2 additions & 2 deletions common/asn1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __ASN1_H__
#define __ASN1_H__
#ifndef COMMON_ASN1_HPP
#define COMMON_ASN1_HPP

#include <string>

Expand Down
6 changes: 3 additions & 3 deletions common/comm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __COMM_H
#define __COMM_H
#ifndef COMMON_COMM_HPP
#define COMMON_COMM_HPP

#include <cstdint>

Expand Down Expand Up @@ -93,5 +93,5 @@ enum class BECOM_Code : uint32_t
BECOM_Code readMessage(std::stringstream &stream);
void sendMessage(const std::string response);

#endif //__COMM_H
#endif //COMMON_COMM_HPP

6 changes: 3 additions & 3 deletions common/crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef ___crypto_h____
#define ___crypto_h____
#ifndef COMMON_CRYPTO_H
#define COMMON_CRYPTO_H

#ifdef __cplusplus
extern "C" {
Expand All @@ -13,4 +13,4 @@ extern "C" {
}
#endif

#endif
#endif // COMMON_CRYPTO_H
6 changes: 3 additions & 3 deletions common/general.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if !defined(__GENERAL_INC__)
#define __GENERAL_INC__
#ifndef COMMON_GENERAL_INC_H
#define COMMON_GENERAL_INC_H

#define RET_OK 0
#define E_ALLOC_ERR ((unsigned int)0xB0010003)
Expand Down Expand Up @@ -61,4 +61,4 @@
}
#endif

#endif
#endif // COMMON_GENERAL_INC_H
6 changes: 3 additions & 3 deletions common/hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __hash_h
#define __hash_h
#ifndef COMMON_HASH_H
#define COMMON_HASH_H

#include <cstddef>

Expand All @@ -28,4 +28,4 @@ const unsigned char* hash_header_for_algo(int hashAlgo);
size_t hash_length_for_algoheader(int hashAlgo);
unsigned int algo2str(const char *hash_algo);

#endif
#endif // COMMON_HASH_H
6 changes: 3 additions & 3 deletions common/log.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __LOG_H
#define __LOG_H
#ifndef Log_hpp
#define Log_hpp

#ifndef MAX_PATH
#define MAX_PATH 260
Expand All @@ -20,4 +20,4 @@ void log_error(const char *string,... );
}
#endif

#endif
#endif // Log_hpp
6 changes: 3 additions & 3 deletions common/native.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#ifndef __RUN_NATIVE_H__
#define __RUN_NATIVE_H__
#ifndef Run_native_hpp
#define Run_native_hpp

int runNative(int argc, const char * argv[]);

#endif //__RUN_NATIVE_H__
#endif //Run_native_hpp

6 changes: 3 additions & 3 deletions common/setup.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#ifndef __RUN_SETUP_H__
#define __RUN_SETUP_H__
#ifndef COMMON_RUN_SETUP_H
#define COMMON_RUN_SETUP_H


int runSetup(int argc, const char * argv[]);


#endif //__RUN_SETUP_H__
#endif //COMMON_RUN_SETUP_H

6 changes: 3 additions & 3 deletions common/test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __RUN_TEST_H__
#define __RUN_TEST_H__
#ifndef COMMON_RUN_TEST_H
#define COMMON_RUN_TEST_H

int runTest(int argc, const char * argv[]);

Expand All @@ -22,5 +22,5 @@ extern bool unittest_Generate_Exception_PIN_TOO_LONG;
extern bool unittest_Generate_Exception_PIN_Incorrect;
#endif

#endif //__RUN_TEST_H__
#endif //COMMON_RUN_TEST_H

6 changes: 3 additions & 3 deletions common/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef __UTIL_H
#define __UTIL_H
#ifndef COMMON_UTIL_H
#define COMMON_UTIL_H

#include <stdio.h>
#include <string.h>
Expand Down Expand Up @@ -30,4 +30,4 @@ size_t base64encode(const unsigned char *string, size_t len, unsigned char *enco
std::string rawToBase64(const std::vector<unsigned char>& raw);
const std::vector<unsigned char> base64ToRaw(const std::string& bufcoded);

#endif //
#endif // COMMON_UTIL_H