Skip to content

Commit

Permalink
Continuing to refactor SETTINGS_DATA.
Browse files Browse the repository at this point in the history
  • Loading branch information
jief666 committed Feb 11, 2021
1 parent f17a05f commit 8209394
Show file tree
Hide file tree
Showing 79 changed files with 1,552 additions and 1,405 deletions.
2 changes: 1 addition & 1 deletion Include/Library/printf_lite.h
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ typedef union {
inline void printf_with_callback(const char* format, transmitBufCallBackType transmitBufCallBack, void* context, ...) {
PRINTF_VA_LIST va;
va_start(va, context);
vprintf_with_callback_timestamp(foPRINTF_VA_ENDva, transmitBufCallBack, context, NULL, 0);
vprintf_with_callback_timestamp(format, va, transmitBufCallBack, context, NULL, 0);
PRINTF_VA_END(va);
}
# endif
Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/aes.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#ifndef HEADER_AES_H
#define HEADER_AES_H

#include <openssl/opensslconf.h>
#include "opensslconf.h"

#ifdef OPENSSL_NO_AES
#error AES is disabled.
Expand Down
14 changes: 7 additions & 7 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/asn1.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,18 @@
#define HEADER_ASN1_H

#include <time.h>
#include <openssl/e_os2.h>
#include "e_os2.h"
#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#include "bio.h"
#endif
#include <openssl/stack.h>
#include <openssl/safestack.h>
#include "stack.h"
#include "safestack.h"

#include <openssl/symhacks.h>
#include "symhacks.h"

#include <openssl/ossl_typ.h>
#include "ossl_typ.h"
#ifndef OPENSSL_NO_DEPRECATED
#include <openssl/bn.h>
#include "bn.h"
#endif

#ifdef OPENSSL_BUILD_SHLIBCRYPTO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#ifndef HEADER_ASN1_MAC_H
#define HEADER_ASN1_MAC_H

#include <openssl/asn1.h>
#include "asn1.h"

#ifdef __cplusplus
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/asn1t.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
#define HEADER_ASN1T_H

#include <stddef.h>
#include <openssl/e_os2.h>
#include <openssl/asn1.h>
#include "e_os2.h"
#include "asn1.h"

#ifdef OPENSSL_BUILD_SHLIBCRYPTO
# undef OPENSSL_EXTERN
Expand Down
4 changes: 2 additions & 2 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/bio.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
#ifndef HEADER_BIO_H
#define HEADER_BIO_H

#include <openssl/e_os2.h>
#include "e_os2.h"

#ifndef OPENSSL_NO_FP_API
# include <stdio.h>
#endif
#include <stdarg.h>

#include <openssl/crypto.h>
#include "crypto.h"

#ifndef OPENSSL_NO_SCTP
# ifndef OPENSSL_SYS_VMS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#ifndef HEADER_BLOWFISH_H
#define HEADER_BLOWFISH_H

#include <openssl/e_os2.h>
#include "e_os2.h"

#ifdef __cplusplus
extern "C" {
Expand Down
6 changes: 3 additions & 3 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/bn.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@
#ifndef HEADER_BN_H
#define HEADER_BN_H

#include <openssl/e_os2.h>
#include "e_os2.h"
#ifndef OPENSSL_NO_FP_API
#include <stdio.h> /* FILE */
#endif
#include <openssl/ossl_typ.h>
#include <openssl/crypto.h>
#include "ossl_typ.h"
#include "crypto.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#ifndef HEADER_BUFFER_H
#define HEADER_BUFFER_H

#include <openssl/ossl_typ.h>
#include "ossl_typ.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/cast.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
extern "C" {
#endif

#include <openssl/opensslconf.h>
#include "opensslconf.h"

#ifdef OPENSSL_NO_CAST
#error CAST is disabled.
Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/cmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
extern "C" {
#endif

#include <openssl/evp.h>
#include "evp.h"

/* Opaque */
typedef struct CMAC_CTX_st CMAC_CTX;
Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/comp.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef HEADER_COMP_H
#define HEADER_COMP_H

#include <openssl/crypto.h>
#include "crypto.h"

#ifdef __cplusplus
extern "C" {
Expand Down
12 changes: 6 additions & 6 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
#ifndef HEADER_CONF_H
#define HEADER_CONF_H

#include <openssl/bio.h>
#include <openssl/lhash.h>
#include <openssl/stack.h>
#include <openssl/safestack.h>
#include <openssl/e_os2.h>
#include "bio.h"
#include "lhash.h"
#include "stack.h"
#include "safestack.h"
#include "e_os2.h"

#include <openssl/ossl_typ.h>
#include "ossl_typ.h"

#ifdef __cplusplus
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/conf_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
#ifndef HEADER_CONF_API_H
#define HEADER_CONF_API_H

#include <openssl/lhash.h>
#include <openssl/conf.h>
#include "lhash.h"
#include "conf.h"

#ifdef __cplusplus
extern "C" {
Expand Down
14 changes: 7 additions & 7 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/crypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,24 +119,24 @@

#include <stdlib.h>

#include <openssl/e_os2.h>
#include "e_os2.h"

#ifndef OPENSSL_NO_FP_API
#include <stdio.h>
#endif

#include <openssl/stack.h>
#include <openssl/safestack.h>
#include <openssl/opensslv.h>
#include <openssl/ossl_typ.h>
#include "stack.h"
#include "safestack.h"
#include "opensslv.h"
#include "ossl_typ.h"

#ifdef CHARSET_EBCDIC
#include <openssl/ebcdic.h>
#include "ebcdic.h"
#endif

/* Resolve problems on some operating systems with symbol names that clash
one way or another */
#include <openssl/symhacks.h>
#include "symhacks.h"

#ifdef __cplusplus
extern "C" {
Expand Down
4 changes: 2 additions & 2 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/des.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#ifndef HEADER_NEW_DES_H
#define HEADER_NEW_DES_H

#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES,
#include "e_os2.h" /* OPENSSL_EXTERN, OPENSSL_NO_DES,
DES_LONG (via openssl/opensslconf.h */

#ifdef OPENSSL_NO_DES
Expand Down Expand Up @@ -98,7 +98,7 @@ typedef struct DES_ks
#endif

#ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
# include <openssl/des_old.h>
# include "des_old.h"
#endif

#define DES_KEY_SZ (sizeof(DES_cblock))
Expand Down
8 changes: 4 additions & 4 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/des_old.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
#ifndef HEADER_DES_H
#define HEADER_DES_H

#include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
#include "e_os2.h" /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */

#ifdef OPENSSL_NO_DES
#error DES is disabled.
Expand All @@ -102,10 +102,10 @@
#endif

#ifdef _KERBEROS_DES_H
#error <openssl/des_old.h> replaces <kerberos/des.h>.
#error "des_old.h> replaces <kerberos/des.h".
#endif

#include <openssl/symhacks.h>
#include "symhacks.h"

#ifdef OPENSSL_BUILD_SHLIBCRYPTO
# undef OPENSSL_EXTERN
Expand Down Expand Up @@ -441,6 +441,6 @@ void _ossl_096_des_random_seed(des_cblock *key);
#endif

/* for DES_read_pw_string et al */
#include <openssl/ui_compat.h>
#include "ui_compat.h"

#endif
8 changes: 4 additions & 4 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/dh.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@
#ifndef HEADER_DH_H
#define HEADER_DH_H

#include <openssl/e_os2.h>
#include "e_os2.h"

#ifdef OPENSSL_NO_DH
#error DH is disabled.
#endif

#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#include "bio.h"
#endif
#include <openssl/ossl_typ.h>
#include "ossl_typ.h"
#ifndef OPENSSL_NO_DEPRECATED
#include <openssl/bn.h>
#include "bn.h"
#endif

#ifndef OPENSSL_DH_MAX_MODULUS_BITS
Expand Down
12 changes: 6 additions & 6 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/dsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,22 @@
#ifndef HEADER_DSA_H
#define HEADER_DSA_H

#include <openssl/e_os2.h>
#include "e_os2.h"

#ifdef OPENSSL_NO_DSA
#error DSA is disabled.
#endif

#ifndef OPENSSL_NO_BIO
#include <openssl/bio.h>
#include "bio.h"
#endif
#include <openssl/crypto.h>
#include <openssl/ossl_typ.h>
#include "crypto.h"
#include "ossl_typ.h"

#ifndef OPENSSL_NO_DEPRECATED
#include <openssl/bn.h>
#include "bn.h"
#ifndef OPENSSL_NO_DH
# include <openssl/dh.h>
# include "dh.h"
#endif
#endif

Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/dso.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
#ifndef HEADER_DSO_H
#define HEADER_DSO_H

#include <openssl/crypto.h>
#include "crypto.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion Library/OpensslLib/openssl-1.0.1e/include/openssl/e_os2.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
*
*/

#include <openssl/opensslconf.h>
#include "opensslconf.h"

#ifndef HEADER_E_OS2_H
#define HEADER_E_OS2_H
Expand Down
8 changes: 4 additions & 4 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/ec.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@
#ifndef HEADER_EC_H
#define HEADER_EC_H

#include <openssl/opensslconf.h>
#include "opensslconf.h"

#ifdef OPENSSL_NO_EC
#error EC is disabled.
#endif

#include <openssl/asn1.h>
#include <openssl/symhacks.h>
#include "asn1.h"
#include "symhacks.h"
#ifndef OPENSSL_NO_DEPRECATED
#include <openssl/bn.h>
#include "bn.h"
#endif

#ifdef __cplusplus
Expand Down
8 changes: 4 additions & 4 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/ecdh.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
#ifndef HEADER_ECDH_H
#define HEADER_ECDH_H

#include <openssl/opensslconf.h>
#include "opensslconf.h"

#ifdef OPENSSL_NO_ECDH
#error ECDH is disabled.
#endif

#include <openssl/ec.h>
#include <openssl/ossl_typ.h>
#include "ec.h"
#include "ossl_typ.h"
#ifndef OPENSSL_NO_DEPRECATED
#include <openssl/bn.h>
#include "bn.h"
#endif

#ifdef __cplusplus
Expand Down
8 changes: 4 additions & 4 deletions Library/OpensslLib/openssl-1.0.1e/include/openssl/ecdsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@
#ifndef HEADER_ECDSA_H
#define HEADER_ECDSA_H

#include <openssl/opensslconf.h>
#include "opensslconf.h"

#ifdef OPENSSL_NO_ECDSA
#error ECDSA is disabled.
#endif

#include <openssl/ec.h>
#include <openssl/ossl_typ.h>
#include "ec.h"
#include "ossl_typ.h"
#ifndef OPENSSL_NO_DEPRECATED
#include <openssl/bn.h>
#include "bn.h"
#endif

#ifdef __cplusplus
Expand Down
Loading

0 comments on commit 8209394

Please sign in to comment.