diff options
author | lloyd <[email protected]> | 2011-12-28 18:31:26 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2011-12-28 18:31:26 +0000 |
commit | 353c24912b7a5e93c8d8572b7410624691d3377d (patch) | |
tree | 986edb2e42188085c28d45d8a449f01c1ac5206a | |
parent | 2299fee297f8c3efcc59bd9a9c4ab97d40e39632 (diff) |
Cleaner
-rw-r--r-- | src/tls/cert_ver.cpp | 2 | ||||
-rw-r--r-- | src/utils/assert.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/tls/cert_ver.cpp b/src/tls/cert_ver.cpp index 73cd7343b..e4dd7a840 100644 --- a/src/tls/cert_ver.cpp +++ b/src/tls/cert_ver.cpp @@ -25,7 +25,7 @@ Certificate_Verify::Certificate_Verify(RandomNumberGenerator& rng, TLS_Handshake_Hash& hash, const Private_Key* priv_key) { - BOTAN_ASSERT_NONNULL(priv_key, ""); + BOTAN_ASSERT_NONNULL(priv_key); std::string padding = ""; Signature_Format format = IEEE_1363; diff --git a/src/utils/assert.h b/src/utils/assert.h index 135c1d392..5ea5002a8 100644 --- a/src/utils/assert.h +++ b/src/utils/assert.h @@ -36,11 +36,10 @@ void assertion_failure(const char* expr_str, __LINE__); \ } while(0) -#define BOTAN_ASSERT_NONNULL(ptr, msg) \ +#define BOTAN_ASSERT_NONNULL(ptr) \ do { \ if(static_cast<bool>(ptr) == false) \ Botan::assertion_failure(#ptr " is not null", \ - msg, \ BOTAN_ASSERT_FUNCTION, \ __FILE__, \ __LINE__); \ |