[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master adf263fe 11/13: Assume __STDC__ everywhere ap
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master adf263fe 11/13: Assume __STDC__ everywhere appropriate |
Date: |
Mon, 23 May 2022 17:40:27 -0400 (EDT) |
branch: master
commit adf263fe5ed52f0f220e9248fc2407bf5fb310f4
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Assume __STDC__ everywhere appropriate
Whether or not it's defined for C++ is "implementation defined", but
that doesn't matter here. This change doesn't assert that it is defined;
rather, it removes ancient conditional K&R declarations.
---
config_como_mingw.hpp | 4 ----
md5.hpp | 44 +++++++++-----------------------------------
test_coding_rules.cpp | 1 -
3 files changed, 9 insertions(+), 40 deletions(-)
diff --git a/config_como_mingw.hpp b/config_como_mingw.hpp
index a02a6e69..e36500fd 100644
--- a/config_como_mingw.hpp
+++ b/config_como_mingw.hpp
@@ -38,10 +38,6 @@
# define LMI_COMO_STRICT_MODE
#endif // !defined c_plusplus
-#if !defined __STDC__
-# define LMI_COMO_MS_MODE
-#endif // !defined __STDC__
-
#if defined LMI_COMO_STRICT_MODE && !defined LMI_COMO_MS_MODE
# define __declspec(deliberately_ignored)
#endif // defined LMI_COMO_STRICT_MODE && !defined LMI_COMO_MS_MODE
diff --git a/md5.hpp b/md5.hpp
index 53457da9..bce48426 100644
--- a/md5.hpp
+++ b/md5.hpp
@@ -60,29 +60,6 @@ extern "C" {
typedef std::uint32_t md5_uint32;
-/* GWC: Here, __STDC__ is tested, but what should be done if that test
- * fails? The gnu project assumes it may have a pre-1989 C compiler. I
- * prefer to assume I have a conforming compiler in a mode of relaxed
- * conformance that nonetheless permits prototypes--which are required
- * by C++ anyway.
- *
- * [space follows leading underscores in reserved name]
- * At any rate, "_ _ P" is a reserved name, and moving it from glibc
- * to lmi makes that a problem not just in theory but also in fact
- * because it conflicts with GNU/Linux system headers, so it's renamed
- * here (and explicitly undefined at the end of the header). Even in
- * this commented-out code, "_ _ P" has been rewritten as "MD5_P" to
- * avoid triggering lmi's tests for reserved identifiers.
- *
- * #undef MD5_P
- * #if defined __STDC__ && __STDC__
- * #define MD5_P(x) x
- * #else // !(defined __STDC__ && __STDC__)
- * #define MD5_P(x) ()
- * #endif // !(defined __STDC__ && __STDC__)
- */
-#define LMI_P(x) x
-
/* Structure to save state of computation between the single steps. */
struct md5_ctx
{
@@ -104,23 +81,23 @@ struct md5_ctx
/* Initialize structure containing state of computation.
* (RFC 1321, 3.3: Step 3)
*/
-extern void md5_init_ctx LMI_P ((struct md5_ctx *ctx));
+extern void md5_init_ctx (struct md5_ctx *ctx);
/* Starting with the result of former calls of this function (or the
* initialization function update the context for the next LEN bytes
* starting at BUFFER.
* TRICKY !! It is necessary that LEN is a multiple of 64.
*/
-extern void md5_process_block LMI_P ((const void *buffer, std::size_t len,
- struct md5_ctx *ctx));
+extern void md5_process_block (const void *buffer, std::size_t len,
+ struct md5_ctx *ctx);
/* Starting with the result of former calls of this function (or the
* initialization function update the context for the next LEN bytes
* starting at BUFFER.
* It is NOT required that LEN is a multiple of 64.
*/
-extern void md5_process_bytes LMI_P ((const void *buffer, std::size_t len,
- struct md5_ctx *ctx));
+extern void md5_process_bytes (const void *buffer, std::size_t len,
+ struct md5_ctx *ctx);
/* Process the remaining bytes in the buffer and put result from CTX
* in first 16 bytes following RESBUF. The result is always in little
@@ -130,7 +107,7 @@ extern void md5_process_bytes LMI_P ((const void *buffer,
std::size_t len,
* IMPORTANT: On some systems it is required that RESBUF is correctly
* aligned for a 32 bits value.
*/
-extern void *md5_finish_ctx LMI_P ((struct md5_ctx *ctx, void *resbuf));
+extern void *md5_finish_ctx (struct md5_ctx *ctx, void *resbuf);
/* Put result from CTX in first 16 bytes following RESBUF. The result is
* always in little endian byte order, so that a byte-wise output yields
@@ -139,25 +116,22 @@ extern void *md5_finish_ctx LMI_P ((struct md5_ctx *ctx,
void *resbuf));
* IMPORTANT: On some systems it is required that RESBUF is correctly
* aligned for a 32 bits value.
*/
-extern void *md5_read_ctx LMI_P ((const struct md5_ctx *ctx, void *resbuf));
+extern void *md5_read_ctx (const struct md5_ctx *ctx, void *resbuf);
/* Compute MD5 message digest for bytes read from STREAM. The
* resulting message digest number will be written into the 16 bytes
* beginning at RESBLOCK.
*/
-extern int md5_stream LMI_P ((std::FILE *stream, void *resblock));
+extern int md5_stream (std::FILE *stream, void *resblock);
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
* result is always in little endian byte order, so that a byte-wise
* output yields to the wanted ASCII representation of the message
* digest.
*/
-extern void *md5_buffer LMI_P ((const char *buffer, std::size_t len, void
*resblock));
+extern void *md5_buffer (const char *buffer, std::size_t len, void *resblock);
#if defined __cplusplus
} /* extern "C" */
#endif // defined __cplusplus
-/* GWC: Explicitly undefine prototype macro. */
-#undef LMI_P
-
#endif // md5_hpp
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index c46b0344..16287814 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -932,7 +932,6 @@ bool check_reserved_name_exception(std::string const& s)
,"__FILE__"
,"__LINE__"
,"__STDC_IEC_559__"
- ,"__STDC__"
,"__cplusplus"
,"__func__"
,"__has_include"
- [lmi-commits] [lmi] master updated (ad1f8a2f -> 599c44b7), Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 38dd359d 04/13: Apply 'fdlibm*.c' changes to 'fdlibm.h', Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master a456d40d 03/13: Expunge unwanted part of fdlibm header, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 9d7e3be1 02/13: Import header from fdlibm, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master e5850c2a 12/13: Import Naohiko Shimizu's NetBSD performance improvements, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master bfb73bb2 09/13: Use fdlibm header more broadly, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 599c44b7 13/13: Draw attention to atrocious type puns, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 164db076 10/13: Assume __STDC__ for fdlibm, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 7d5c739b 01/13: Expunge unused declarations and macro, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master d7294669 06/13: Add include guards; include a header required by lmi, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master adf263fe 11/13: Assume __STDC__ everywhere appropriate,
Greg Chicares <=
- [lmi-commits] [lmi] master edb56e9b 05/13: Add license and copyright boilerplate, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 50b2645a 08/13: Use fdlibm header, Greg Chicares, 2022/05/23
- [lmi-commits] [lmi] master 89966e80 07/13: Rename fdlibm header, Greg Chicares, 2022/05/23