Merge pull request #286 from ejohnstown/include-guard

Include File Guards
pull/289/head
JacobBarthelmeh 2020-09-25 10:53:47 -06:00 committed by GitHub
commit 962540fd4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 104 additions and 56 deletions

View File

@ -19,13 +19,11 @@
*/
#pragma once
#ifndef _WOLFSSH_CLIENT_H_
#define _WOLFSSH_CLIENT_H_
#ifndef _WOLFSSH_EXAMPLES_CLIENT_H_
#define _WOLFSSH_EXAMPLES_CLIENT_H_
THREAD_RETURN WOLFSSH_THREAD client_test(void* args);
#endif /* _WOLFSSH_CLIENT_H_ */
#endif /* _WOLFSSH_EXAMPLES_CLIENT_H_ */

View File

@ -19,13 +19,11 @@
*/
#pragma once
#ifndef _WOLFSSH_ECHOSERVER_H_
#define _WOLFSSH_ECHOSERVER_H_
#ifndef _WOLFSSH_EXAMPLES_ECHOSERVER_H_
#define _WOLFSSH_EXAMPLES_ECHOSERVER_H_
THREAD_RETURN WOLFSSH_THREAD echoserver_test(void* args);
#endif /* _WOLFSSH_ECHOSERVER_H_ */
#endif /* _WOLFSSH_EXAMPLES_ECHOSERVER_H_ */

View File

@ -1,8 +1,27 @@
#pragma once
/* wolfssh_portfwd.h
*
* Copyright (C) 2014-2020 wolfSSL Inc.
*
* This file is part of wolfSSH.
*
* wolfSSH is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* wolfSSH is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _WOLFSSH_CLIENT_H_
#define _WOLFSSH_CLIENT_H_
#ifndef _WOLFSSH_EXAMPLES_PORTFWD_H_
#define _WOLFSSH_EXAMPLES_PORTFWD_H_
THREAD_RETURN WOLFSSH_THREAD portfwd_worker(void* args);
#endif /* _WOLFSSH_CLIENT_H_ */
#endif /* _WOLFSSH_EXAMPLES_PORTFWD_H_ */

View File

@ -19,11 +19,9 @@
*/
#pragma once
#ifndef _WOLFSSH_SCPCLIENT_H_
#define _WOLFSSH_SCPCLIENT_H_
#ifndef _WOLFSSH_EXAMPLES_SCPCLIENT_H_
#define _WOLFSSH_EXAMPLES_SCPCLIENT_H_
THREAD_RETURN WOLFSSH_THREAD scp_client(void*);
#endif /* _WOLFSSH_SCPCLIENT_H_ */
#endif /* _WOLFSSH_EXAMPLES_SCPCLIENT_H_ */

View File

@ -19,13 +19,11 @@
*/
#pragma once
#ifndef _WOLFSSH_SERVER_H_
#define _WOLFSSH_SERVER_H_
#ifndef _WOLFSSH_EXAMPLES_SERVER_H_
#define _WOLFSSH_EXAMPLES_SERVER_H_
THREAD_RETURN WOLFSSH_THREAD server_test(void* args);
#endif /* _WOLFSSH_SERVER_H_ */
#endif /* _WOLFSSH_EXAMPLES_SERVER_H_ */

View File

@ -19,9 +19,10 @@
*/
#pragma once
#ifndef _WOLFSSH_EXAMPLES_SFTPCLIENT_H_
#define _WOLFSSH_EXAMPLES_SFTPCLIENT_H_
THREAD_RETURN WOLFSSH_THREAD sftpclient_test(void* args);
#endif /* _WOLFSSH_EXAMPLES_SFTPCLIENT_H_ */

View File

@ -23,7 +23,8 @@
*/
#pragma once
#ifndef _WOLFSSH_AGENT_H_
#define _WOLFSSH_AGENT_H_
#include <wolfssh/settings.h>
#include <wolfssh/ssh.h>
@ -188,3 +189,6 @@ WOLFSSH_API int wolfSSH_AGENT_SignRequest(WOLFSSH*, const byte*, word32,
#ifdef __cplusplus
}
#endif
#endif /* _WOLFSSH_AGENT_H_ */

View File

@ -18,8 +18,8 @@
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef WOLFSSL_CERTS_TEST_H
#define WOLFSSL_CERTS_TEST_H
#ifndef _WOLFSSH_CERTS_TEST_H_
#define _WOLFSSH_CERTS_TEST_H_
#if defined(NO_FILESYSTEM)
@ -222,5 +222,5 @@ static const int sizeof_ecc_key_der_521 = sizeof(ecc_key_der_521);
#endif /* NO_FILESYSTEM */
#endif /* WOLFSSL_CERTS_TEST_H */
#endif /* _WOLFSSL_CERTS_TEST_H_ */

View File

@ -24,7 +24,8 @@
*/
#pragma once
#ifndef _WOLFSSH_ERROR_H_
#define _WOLFSSH_ERROR_H_
#include <wolfssh/settings.h>
@ -137,4 +138,5 @@ enum WS_IOerrors {
#ifdef __cplusplus
}
#endif
#endif /* _WOLFSSH_ERROR_H_ */

View File

@ -25,7 +25,8 @@
*/
#pragma once
#ifndef _WOLFSSH_INTERNAL_H_
#define _WOLFSSH_INTERNAL_H_
#include <wolfssh/ssh.h>
#include <wolfssh/wolfsftp.h>
@ -900,3 +901,5 @@ enum TerminalModes {
}
#endif
#endif /* _WOLFSSH_INTERNAL_H_ */

View File

@ -25,10 +25,8 @@
*/
#pragma once
#ifndef WOLFSSH_KEYGEN_H
#define WOLFSSH_KEYGEN_H
#ifndef _WOLFSSH_KEYGEN_H_
#define _WOLFSSH_KEYGEN_H_
#include <wolfssh/settings.h>
#include <wolfssh/port.h>
@ -49,4 +47,5 @@ WOLFSSH_API int wolfSSH_MakeRsaKey(byte*, word32, word32, word32);
}
#endif
#endif
#endif /* _WOLFSSH_KEYGEN_H_ */

View File

@ -26,7 +26,8 @@
*/
#pragma once
#ifndef _WOLFSSH_LOG_H_
#define _WOLFSSH_LOG_H_
#include <wolfssh/settings.h>
@ -80,3 +81,5 @@ WOLFSSH_API void wolfSSH_Log(enum wolfSSH_LogLevel,
}
#endif
#endif /* _WOLFSSH_LOG_H_ */

View File

@ -18,10 +18,9 @@
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#ifndef WOLFSSH_MISC_H
#define WOLFSSH_MISC_H
#ifndef _WOLFSSH_MISC_H_
#define _WOLFSSH_MISC_H_
#ifdef __cplusplus
@ -55,6 +54,5 @@ WOLFSSH_LOCAL void CreateMpint(byte*, word32*, byte*);
} /* extern "C" */
#endif
#endif /* WOLFSSH_MISC_H */
#endif /* _WOLFSSH_MISC_H_ */

View File

@ -27,7 +27,8 @@
*/
#pragma once
#ifndef _WOLFSSH_PORT_H_
#define _WOLFSSH_PORT_H_
#include <wolfssh/settings.h>
#include <wolfssh/log.h>
@ -1111,3 +1112,5 @@ extern "C" {
}
#endif
#endif /* _WOLFSSH_PORT_H_ */

View File

@ -26,7 +26,8 @@
*/
#pragma once
#ifndef _WOLFSSH_SETTINGS_H_
#define _WOLFSSH_SETTINGS_H_
#include <wolfssh/visibility.h>
@ -75,3 +76,5 @@ extern "C" {
}
#endif
#endif /* _WOLFSSH_SETTINGS_H_ */

View File

@ -24,7 +24,9 @@
*/
#pragma once
#ifndef _WOLFSSH_SSH_H_
#define _WOLFSSH_SSH_H_
#ifdef WOLFSSL_USER_SETTINGS
#include <wolfssl/wolfcrypt/settings.h>
@ -297,3 +299,5 @@ WOLFSSH_API void wolfSSH_ShowSizes(void);
}
#endif
#endif /* _WOLFSSH_SSH_H_ */

View File

@ -18,7 +18,6 @@
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#ifndef _WOLFSSH_TEST_H_
#define _WOLFSSH_TEST_H_
@ -887,3 +886,4 @@ static INLINE void ThreadDetach(THREAD_TYPE thread)
#endif /* WOLFSSH_TEST_THREADING */
#endif /* _WOLFSSH_TEST_H_ */

View File

@ -27,7 +27,9 @@
*/
#pragma once
#ifndef _WOLFSSH_VERSION_H_
#define _WOLFSSH_VERSION_H_
#ifdef __cplusplus
extern "C" {
@ -40,3 +42,5 @@ extern "C" {
}
#endif
#endif /* _WOLFSSH_VERSION_H_ */

View File

@ -27,7 +27,9 @@
*/
#pragma once
#ifndef _WOLFSSH_VERSION_H_
#define _WOLFSSH_VERSION_H_
#ifdef __cplusplus
extern "C" {
@ -40,3 +42,5 @@ extern "C" {
}
#endif
#endif /* _WOLFSSH_VERSION_H_ */

View File

@ -26,7 +26,8 @@
*/
#pragma once
#ifndef _WOLFSSH_VISIBILITY_H_
#define _WOLFSSH_VISIBILITY_H_
#ifdef __cplusplus
@ -77,3 +78,5 @@ extern "C" {
}
#endif
#endif /* _WOLFSSH_VISIBILITY_H_ */

View File

@ -18,10 +18,10 @@
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#ifndef WOLFSSH_WOLFSCP_H
#define WOLFSSH_WOLFSCP_H
#ifndef _WOLFSSH_WOLFSCP_H_
#define _WOLFSSH_WOLFSCP_H_
#include <wolfssh/settings.h>
#include <wolfssh/ssh.h>
@ -139,5 +139,5 @@ WOLFSSH_API int wolfSSH_SCP_from(WOLFSSH*, const char*, const char*);
#endif /* WOLFSSH_SCP */
#endif /* WOLFSSH_WOLFSCP_H */
#endif /* _WOLFSSH_WOLFSCP_H_ */

View File

@ -18,7 +18,10 @@
* along with wolfSSH. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#ifndef _WOLFSSH_WOLFSFTP_H_
#define _WOLFSSH_WOLFSFTP_H_
#ifdef WOLFSSL_USER_SETTINGS
#include <wolfssl/wolfcrypt/settings.h>
@ -241,3 +244,6 @@ WOLFSSH_LOCAL void wolfSSH_SFTP_ShowSizes(void);
#ifdef __cplusplus
}
#endif
#endif /* _WOLFSSH_WOLFSFTP_H_ */