[Git][NTPsec/ntpsec][master] 2 commits: assert: remove unused DEBUG_INVARIANT()

[Gary E. Miller]

Gary E. Miller pushed to branch master at NTPsec / ntpsec


Commits:
1b8a0c83 by Gary E. Miller at 2017-06-01T21:12:10-07:00
assert: remove unused DEBUG_INVARIANT()

- - - - -
911c1449 by Gary E. Miller at 2017-06-01T21:23:57-07:00
assert: remove unneeded shim ALWAYS_ENSURE

ENSURE() was always ALWAYS_ENSURE(), and ALWAYS_ENSURE() not
used any other place.

- - - - -


1 changed file:

- include/ntp_assert.h


Changes:

=====================================
include/ntp_assert.h
=====================================
--- a/include/ntp_assert.h
+++ b/include/ntp_assert.h
@@ -55,7 +55,7 @@
 #define ALWAYS_REQUIRE(x)	assert(x)
 #define INSIST(x)		assert(x)
 #define ALWAYS_INVARIANT(x)	assert(x)
-#define ALWAYS_ENSURE(x)	assert(x)
+#define ENSURE(x)		assert(x)
 
 # else	/* not FlexeLint */
 
@@ -154,23 +154,20 @@ isc_assertion_typetotext(isc_assertiontype_t type)
 #define ALWAYS_REQUIRE(x)	ISC_REQUIRE(x)
 #define INSIST(x)		ISC_INSIST(x)
 #define ALWAYS_INVARIANT(x)	ISC_INVARIANT(x)
-#define ALWAYS_ENSURE(x)	ISC_ENSURE(x)
+#define ENSURE(x)		ISC_ENSURE(x)
 
 # endif /* not FlexeLint */
 
 #define	REQUIRE(x)		ALWAYS_REQUIRE(x)
 #define	INVARIANT(x)		ALWAYS_INVARIANT(x)
-#define	ENSURE(x)		ALWAYS_ENSURE(x)
 
 # ifdef DEBUG
 #define	DEBUG_REQUIRE(x)	REQUIRE(x)
 #define	DEBUG_INSIST(x)		INSIST(x)
-#define	DEBUG_INVARIANT(x)	INVARIANT(x)
 #define	DEBUG_ENSURE(x)		ENSURE(x)
 # else
 #define	DEBUG_REQUIRE(x)	do {} while (false)
 #define	DEBUG_INSIST(x)		do {} while (false)
-#define	DEBUG_INVARIANT(x)	do {} while (false)
 #define	DEBUG_ENSURE(x)		do {} while (false)
 # endif
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/1f195ea549b2ee1c767f88b5a760bef35bcabf04...911c1449aa49b7f1a73eac4d7c26b2b9b8da1218

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/1f195ea549b2ee1c767f88b5a760bef35bcabf04...911c1449aa49b7f1a73eac4d7c26b2b9b8da1218
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170602/7a0c89db/attachment.html>