CRASHREPORT cleanup

make deprecation warning suppression unconditional
formatting/whitespace
This commit is contained in:
nhkeni
2023-09-07 20:55:07 -04:00
parent b75bc87662
commit 33d85bfe08
+5 -8
View File
@@ -224,10 +224,12 @@ NH_abort(char *why)
#ifdef CRASHREPORT #ifdef CRASHREPORT
# include <fcntl.h> # include <fcntl.h>
# define HASH_PRAGMA_START \
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
# define HASH_PRAGMA_END _Pragma("GCC diagnostic pop");
# ifdef MACOS # ifdef MACOS
# include <CommonCrypto/CommonDigest.h> # include <CommonCrypto/CommonDigest.h>
# define HASH_PRAGMA_START
# define HASH_PRAGMA_END
# define HASH_CONTEXT CC_MD4_CTX # define HASH_CONTEXT CC_MD4_CTX
# define HASH_INIT(ctx) CC_MD4_Init(ctx) # define HASH_INIT(ctx) CC_MD4_Init(ctx)
# define HASH_UPDATE(ctx, ptr, len) CC_MD4_Update(ctx, ptr, len) # define HASH_UPDATE(ctx, ptr, len) CC_MD4_Update(ctx, ptr, len)
@@ -236,16 +238,11 @@ NH_abort(char *why)
# endif # endif
# ifdef __linux__ # ifdef __linux__
# include <openssl/md4.h> # include <openssl/md4.h>
# define HASH_PRAGMA_START \
_Pragma("GCC diagnostic push"); \
_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
# define HASH_PRAGMA_END _Pragma("GCC diagnostic pop");
# define HASH_CONTEXT MD4_CTX # define HASH_CONTEXT MD4_CTX
# define HASH_INIT(ctx) MD4_Init(ctx) # define HASH_INIT(ctx) MD4_Init(ctx)
# define HASH_UPDATE(ctx, ptr, len) MD4_Update(ctx, ptr, len) # define HASH_UPDATE(ctx, ptr, len) MD4_Update(ctx, ptr, len)
# define HASH_FINISH(ctx, out) MD4_Final(out, ctx) # define HASH_FINISH(ctx, out) MD4_Final(out, ctx)
# define HASH_RESULT_SIZE MD4_DIGEST_LENGTH # define HASH_RESULT_SIZE MD4_DIGEST_LENGTH
# endif # endif
// Binary ID - Use only as a hint to contact.html for recognizing our own // Binary ID - Use only as a hint to contact.html for recognizing our own
// binaries. This is easily spoofed! // binaries. This is easily spoofed!
@@ -421,7 +418,7 @@ submit_web_report(const char *msg, char *why){
} }
return FALSE; return FALSE;
} }
#endif // CRASHREPORT #endif /* CRASHREPORT */
#undef SWR_ADD #undef SWR_ADD
#undef SWR_FRAMES #undef SWR_FRAMES
#undef SWR_HDR #undef SWR_HDR