From 4d2e682a957943f632c621a45940f9dcff054bee Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Mon, 29 Jan 2018 10:19:56 -0500 Subject: [PATCH] make changes suggested by andrew that remove warning messages --- src/ca/caChannel.cpp | 5 +---- src/ca/caProvider.cpp | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp index 1c1d0e9..d145a71 100644 --- a/src/ca/caChannel.cpp +++ b/src/ca/caChannel.cpp @@ -422,13 +422,10 @@ void CAChannel::disconnectChannel() << " channelCreated " << (channelCreated ? "true" : "false") << endl; } - bool disconnect = true; { Lock lock(requestsMutex); - if(!channelCreated) disconnect = false; - channelCreated = false; + if(!channelCreated) return; } - if(!disconnect) return; /* Clear CA Channel */ threadAttach(); ca_clear_channel(channelID); diff --git a/src/ca/caProvider.cpp b/src/ca/caProvider.cpp index 9267285..e7fb52e 100644 --- a/src/ca/caProvider.cpp +++ b/src/ca/caProvider.cpp @@ -190,9 +190,7 @@ void ca_factory_cleanup(void*) ChannelProviderRegistry::clients()->remove("ca"); ca_context_destroy(); } catch(std::exception& e) { - std::string message("Error when unregister \"ca\" factory"); - message += e.what(); - LOG(logLevelWarn,message.c_str()); + LOG(logLevelWarn, "Error on unregistering \"ca\" factory: %s", e.what()); } }