Merge remote-tracking branch 'origin/master'

* origin/master:
  prevent CAChannel::disconnectChannel() from calling ca_clear_channel twice This was causing a crash when exiting
  Revert "When caProvider is destroyed make sure all channels are cleared"
  make changes suggested by andrew that remove warning messages
  Clean up compiler warnings
  fix issue #77
This commit is contained in:
Michael Davidsaver
2018-01-31 11:51:57 -08:00
6 changed files with 91 additions and 38 deletions

View File

@@ -1599,7 +1599,7 @@ void BlockingServerTCPTransportCodec::authenticationCompleted(epics::pvData::Sta
string errorMessage = "Re-authentication failed: " + status.getMessage();
if (!status.getStackDump().empty())
errorMessage += "\n" + status.getStackDump();
LOG(logLevelInfo, errorMessage.c_str());
LOG(logLevelInfo, "%s", errorMessage.c_str());
close();
}