From 904e8ce2839b2effce4ad66b0da0bf4b468584af Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 1 Jul 2018 22:20:45 -0400 Subject: Remove code to accomodate variable block size (GH #535) This should have occured when we yanked the variable block size experiment --- bench1.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bench1.cpp b/bench1.cpp index 4cee1702..36e1a52d 100644 --- a/bench1.cpp +++ b/bench1.cpp @@ -296,18 +296,17 @@ void BenchMarkByName2(const char *factoryName, size_t keyLength = 0, const char std::string name(factoryName ? factoryName : ""); member_ptr obj(ObjectFactoryRegistry::Registry().CreateObject(name.c_str())); - if (!keyLength) + if (keyLength == 0) keyLength = obj->DefaultKeyLength(); - if (displayName) + if (displayName != NULLPTR) name = displayName; - else if (keyLength) + else if (keyLength != 0) name += " (" + IntToString(keyLength * 8) + "-bit key)"; - const int blockSize = params.GetIntValueWithDefault(Name::BlockSize(), 0); - obj->SetKey(defaultKey, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, blockSize ? blockSize : obj->IVSize()), false))); + obj->SetKey(defaultKey, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, obj->IVSize()), false))); BenchMark(name.c_str(), *static_cast(obj.get()), g_allocatedTime); - BenchMarkKeying(*obj, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, blockSize ? blockSize : obj->IVSize()), false))); + BenchMarkKeying(*obj, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), ConstByteArrayParameter(defaultKey, obj->IVSize()), false))); } template -- cgit v1.2.1